diff --git a/.cvsignore b/.cvsignore
index cf174c8..3a60f48 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pyOpenSSL-0.7.tar.gz
+pyOpenSSL-0.9.tar.gz
diff --git a/pyOpenSSL-0.7-openssl.patch b/pyOpenSSL-0.7-openssl.patch
index e9b55b9..562cf6e 100644
--- a/pyOpenSSL-0.7-openssl.patch
+++ b/pyOpenSSL-0.7-openssl.patch
@@ -1,6 +1,7 @@
---- pyOpenSSL-0.7/setup.py	2008-04-11 16:53:24.000000000 +0100
-+++ pyOpenSSL-0.7/setup-new.py	2008-09-15 23:46:19.000000000 +0100
-@@ -64,6 +64,9 @@
+diff -up pyOpenSSL-0.9/setup.py.posixIncludes pyOpenSSL-0.9/setup.py
+--- pyOpenSSL-0.9/setup.py.posixIncludes	2009-03-07 17:50:11.000000000 +0100
++++ pyOpenSSL-0.9/setup.py	2009-09-29 17:46:13.449930310 +0200
+@@ -61,6 +61,9 @@ else:
  if sys.platform == 'darwin':
      IncludeDirs = ['/sw/include']
      LibraryDirs = ['/sw/lib']
@@ -8,5 +9,5 @@
 +    IncludeDirs = ['/usr/kerberos/include']
 +    LibraryDirs = ['/usr/kerberos/lib']
  
- def mkExtension(name):
-     modname = 'OpenSSL.' + name
+ # On Windows, make sure the necessary .dll's get added to the egg.
+ data_files = []
diff --git a/pyOpenSSL.spec b/pyOpenSSL.spec
index a0a6c5a..980d365 100644
--- a/pyOpenSSL.spec
+++ b/pyOpenSSL.spec
@@ -2,13 +2,14 @@
 
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
-Version: 0.7
-Release: 7%{?dist}
+Version: 0.9
+Release: 1%{?dist}
 Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
 Patch0: pyOpenSSL-0.7-openssl.patch
 Patch2: pyOpenSSL-elinks.patch
 Patch3: pyOpenSSL-nopdfout.patch
-Patch4: pyOpenSSL-threadsafe.patch
+# Hopefully the following patch is unnecessary now
+#Patch4: pyOpenSSL-threadsafe.patch
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -26,10 +27,9 @@ High-level wrapper around a subset of the OpenSSL library, includes
 
 %prep
 %setup -q
-%patch0 -p1 -b .openssl097
+%patch0 -p1 -b .posixIncludes
 %patch2 -p1 -b .elinks
 %patch3 -p1 -b .nopdfout
-%patch4 -p1 -b .threadsafe
 # Fix permissions for debuginfo package
 %{__chmod} -x src/ssl/connection.c
 
@@ -37,6 +37,7 @@ High-level wrapper around a subset of the OpenSSL library, includes
 CFLAGS="%{optflags}" %{__python} setup.py build
 %{__make} -C doc ps
 %{__make} -C doc text html
+find doc/ -name pyOpenSSL.\*
 
 %install
 %{__rm} -rf %{buildroot}
@@ -47,12 +48,15 @@ CFLAGS="%{optflags}" %{__python} setup.py build
 
 %files
 %defattr(-,root,root,-)
-%doc README doc/pyOpenSSL.ps 
-%doc doc/pyOpenSSL.txt doc/html
+%doc README doc/pyOpenSSL.* doc/html
 %{python_sitearch}/OpenSSL/
 %{python_sitearch}/%{name}*.egg-info
 
 %changelog
+* Tue Sep 29 2009 Matěj Cepl <mcepl@redhat.com> - 0.9-1
+- New upstream release
+- Fix BuildRequires to make Postscript documentation buildable
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 0.7-7
 - rebuilt with new openssl
 
diff --git a/sources b/sources
index b9d6697..abc49e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1924edc58c1e99f27763971d9959ea15  pyOpenSSL-0.7.tar.gz
+5bf282b2d6a03af921920c34079580f2  pyOpenSSL-0.9.tar.gz