diff --git a/.cvsignore b/.cvsignore
index ca62d9d..8703f46 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-py-1.0.2.tar.gz
+py-1.1.1.tar.gz
diff --git a/import.log b/import.log
index ee64d02..558a1b5 100644
--- a/import.log
+++ b/import.log
@@ -2,3 +2,4 @@ python-py-0_9_2-6_fc10:HEAD:python-py-0.9.2-6.fc10.src.rpm:1232104910
 python-py-1_0_0-0_b8_fc11:HEAD:python-py-1.0.0-0.b8.fc11.src.rpm:1248303215
 python-py-1_0_0-1_fc11:HEAD:python-py-1.0.0-1.fc11.src.rpm:1250184682
 python-py-1_0_2-1_fc11:HEAD:python-py-1.0.2-1.fc11.src.rpm:1251397988
+python-py-1_1_1-1_fc12:HEAD:python-py-1.1.1-1.fc12.src.rpm:1259422907
diff --git a/python-py.spec b/python-py.spec
index 3303f18..7bd68c3 100644
--- a/python-py.spec
+++ b/python-py.spec
@@ -1,22 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-py
-Version:        1.0.2
+Version:        1.1.1
 Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 Summary:        Innovative python library containing py.test, greenlets and other niceties
 Group:          Development/Languages
-License:        MIT and LGPLv2+ and Public Domain and BSD and Python
-#               - main package: MIT, except:
-#                 - test/rsession/webdata/json.py: LPGLv2+
-#                 - doc/style.css: Public Domain
-#                 - test/web/post_multipart.py: Python
-#                   (see http://code.activestate.com/help/terms)
-#                 - compat/textwrap.py: Python
-#                 - compat/subprocess.py: Python
-#                 - compat/doctest.py: Public Domain
-#                 - compat/optparse.py: BSD
-#               Note that all but the doctest compat files are removed
-#               in the prep stage.
+License:        MIT and Public Domain
+#               main package: MIT, except: doc/style.css: Public Domain
 URL:            http://codespeak.net/py/dist/
 Source:         http://pypi.python.org/packages/source/p/py/py-%{version}%{?prerelease}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,8 +20,6 @@ BuildRequires:  python-pygments
 BuildRequires:  pylint
 BuildRequires:  pexpect
 
-%define doctarget %{buildroot}%{_docdir}/%{name}-%{version}
-
 
 %description
 The py lib aims at supporting a decent development process addressing
@@ -41,13 +29,6 @@ deployment, versioning, testing and documentation perspectives.
 %prep
 %setup -q -n py-%{version}%{?prerelease}
 
-# remove the compatibility modules, and use system modules instead
-for module in doctest optparse textwrap subprocess ; do
-    rm py/compat/$module.py
-    echo "from $module import *" > py/compat/system_$module.py
-    sed -i py/__init__.py -e "s,compat/$module.py,compat/system_$module.py,"
-done
-
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -62,32 +43,9 @@ find %{buildroot}%{python_sitelib} \( -name '*.py' -o -name 'py.*' \) \
    -exec sed -i '1{/^#!/d}' {} \; \
    -exec chmod u=rw,go=r {} \;
 
-# move some txt files to the doc directory
-mkdir -p %{doctarget}
-mv %{buildroot}%{python_sitelib}/py/LICENSE %{doctarget}
-# files are not in the 1.0.2 tarball, but might again be there in
-# later releases:
-#mv %{buildroot}%{python_sitelib}/py/compat/LICENSE %{doctarget}/compat_LICENSE
-#mv %{buildroot}%{python_sitelib}/py/execnet/NOTES %{doctarget}/execnet_NOTES
-#mv %{buildroot}%{python_sitelib}/py/execnet/improve-remote-tracebacks.txt \
-#   %{doctarget}/execnet_improve-remote-tracebacks.txt
-#mv %{buildroot}%{python_sitelib}/py/path/gateway/TODO.txt %{doctarget}/path_gateway_TODO.txt
-#mv %{buildroot}%{python_sitelib}/py/path/svn/quoting.txt %{doctarget}/svn_quoting_path.txt
-cp -pr README.txt doc example contrib %{doctarget}
-
-# remove this and that
-find %{buildroot}%{python_sitelib} -name '*.cmd' -exec rm {} \;
-
-# remove (most) files only used by the testsuite - upstream plans on
-# separating that out for the 1.1 version
-#find %{buildroot}%{python_sitelib} -type d -name testing -prune -exec rm -r {} \;
-#find %{buildroot}%{python_sitelib} -name 'conftest.py*' -exec rm {} \;
-
 
 %check
-# test cannot be run in %{buildroot}, because it uses
-# inspect.getsourcefile() et. al.
-PYTHONPATH=$(pwd)/py %{__python} py/bin/py.test py
+%{__python} bin/py.test --report=failed,skipped
 
 
 %clean
@@ -98,10 +56,20 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/py.*
 %{python_sitelib}/*
-%{_docdir}/%{name}-%{version}
+%doc CHANGELOG LICENSE README.txt
+%doc doc contrib
 
 
 %changelog
+* Sat Nov 28 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.1.1-1
+- Update to 1.1.1.
+
+* Sat Nov 21 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.1.0-1
+- Update to 1.1.0. Upstream reorganized the package's structure and
+  cleaned up the install process, so the specfile could be greatly
+  simplified.
+- Dropped licenses for files no longer present from the License tag.
+
 * Thu Aug 27 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.0.2-1
 - Update to 1.0.2.
 - One failing test is no longer part of the testsuite, thus needs not
diff --git a/sources b/sources
index cb364bd..aa316a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d2e9878b0113159fae2f3ed0cfc081d  py-1.0.2.tar.gz
+4d0b5eaf9af09b7682fb07d4c5a2fd45  py-1.1.1.tar.gz