diff --git a/python-beaker.spec b/python-beaker.spec
index 0ea22eb..dba6d6f 100644
--- a/python-beaker.spec
+++ b/python-beaker.spec
@@ -1,13 +1,13 @@
 Name:          python-beaker
 Version:       1.8.0
-Release:       1mamba
+Release:       2mamba
 Summary:       A Session and Caching library with WSGI Middleware
 Group:         System/Libraries/Python
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://beaker.groovie.org
-Source:        http://pypi.python.org/packages/source/B/Beaker/Beaker-%{version}.tar.gz
+Source:        http://pypi.debian.net/Beaker/Beaker-%{version}.tar.gz
 Patch0:        python-beaker-1.5-absimport.patch
 License:       BSD
 ## AUTOBUILDREQ-BEGIN
@@ -37,8 +37,11 @@ Features
 * Create functions for automatic call-backs to create new cache copies after expiration
 * Fine-grained toggling of back-ends, keys, and expiration per Cache object
 
-%prep
+%if 0%{?with_pyver}
+%pyver_package
+%endif
 
+%prep
 %setup -q -n Beaker-%{version}
 #%patch0 -p0
 
@@ -50,27 +53,20 @@ Features
 %{__python} setup.py install \
    --root="%{buildroot}" \
    --install-headers=%{_includedir}/python \
-   --install-lib=%{python_sitearch}
+   --install-lib=%{python_sitearch} \
+   --record=%{name}.filelist
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%files
+%files %{?pyappend} -f %{name}.filelist
 %defattr(-,root,root)
-%dir %{python_sitearch}/Beaker-%{version}-py%{python_version}.egg-info
-%{python_sitearch}/Beaker-%{version}-py%{python_version}.egg-info/*
-%dir %{python_sitearch}/beaker
-%{python_sitearch}/beaker/*.py
-%{python_sitearch}/beaker/*.pyc
-%dir %{python_sitearch}/beaker/crypto
-%{python_sitearch}/beaker/crypto/*.py
-%{python_sitearch}/beaker/crypto/*.pyc
-%dir %{python_sitearch}/beaker/ext
-%{python_sitearch}/beaker/ext/*.py
-%{python_sitearch}/beaker/ext/*.pyc
 #%doc LICENSE CHANGELOG
 
 %changelog
+* Fri Aug 12 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.0-2mamba
+- -py3 package support
+
 * Fri Jan 29 2016 Automatic Build System <autodist@mambasoft.it> 1.8.0-1mamba
 - automatic version update by autodist