diff --git a/.cvsignore b/.cvsignore
index e69de29..ceee7a9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+jabberpy-0.5-0.tar.gz
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..27d873d
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+jabberpy-0_5-0_17_fc10:HEAD:jabberpy-0.5-0.17.fc10.src.rpm:1225744657
diff --git a/jabberpy-clean-sockets.patch b/jabberpy-clean-sockets.patch
new file mode 100644
index 0000000..b78d8c1
--- /dev/null
+++ b/jabberpy-clean-sockets.patch
@@ -0,0 +1,10 @@
+--- jabberpy-0.5-0-orig/jabber/xmlstream.py	2004-02-03 11:33:37.000000000 -0500
++++ jabberpy-0.5-0/jabber/xmlstream.py	2007-10-03 14:35:29.000000000 -0400
+@@ -385,7 +385,6 @@
+     def disconnect(self):
+         """Close the stream and socket"""
+         self.write ( u"</stream:stream>" )
+-        while self.process(): pass
+         self._sock.close()
+         self._sock = None
+ 
diff --git a/jabberpy-no-init.patch b/jabberpy-no-init.patch
new file mode 100644
index 0000000..0421242
--- /dev/null
+++ b/jabberpy-no-init.patch
@@ -0,0 +1,15 @@
+diff -urN jabberpy-0.5-0-orig/jabber/__init__.py jabberpy-0.5-0/jabber/__init__.py
+--- jabberpy-0.5-0-orig/jabber/__init__.py	1969-12-31 19:00:00.000000000 -0500
++++ jabberpy-0.5-0/jabber/__init__.py	2004-06-14 18:53:10.000000000 -0400
+@@ -0,0 +1,10 @@
++__all__ = []
++
++import jabber
++
++for __s in dir(jabber):
++    __val = getattr(jabber, __s)
++    globals()[__s] = __val
++    __all__.append(__val)
++    
++del __s, __val
+Binary files jabberpy-0.5-0-orig/jabber/.__init__.py.swp and jabberpy-0.5-0/jabber/.__init__.py.swp differ
diff --git a/jabberpy.spec b/jabberpy.spec
new file mode 100644
index 0000000..b072b2c
--- /dev/null
+++ b/jabberpy.spec
@@ -0,0 +1,64 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+Name:          jabberpy
+Version:       0.5
+# Used like this because upstream releases like 0.5-0
+Release:       0.17%{?dist}
+Summary:       Python xmlstream and jabber IM protocol libs
+
+Group:         Development/Libraries
+License:       LGPLv2+
+URL:           http://sourceforge.net/projects/jabberpy/
+Source0:       http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}-0.tar.gz
+Patch0:        jabberpy-no-init.patch
+Patch1:        jabberpy-clean-sockets.patch
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:     noarch
+
+BuildRequires: python-devel
+Requires:      python
+
+%description
+jabber.py is a Python module for the jabber instant messaging
+protocol. jabber.py deals with the xml parsing and socket code,
+leaving the programmer to concentrate on developing quality jabber
+based applications with Python.
+
+%prep
+%setup -q -n %{name}-%{version}-0
+chmod -x examples/*.py
+%patch0 -p1 -b .no-init
+%patch1 -p1 -b .clean-sockets
+
+%build
+%{__python} setup.py  build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --root=$RPM_BUILD_ROOT 
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%doc examples README
+%{python_sitelib}/*
+
+
+%changelog
+* Fri Oct 24 2008 Michael Stahnke <stahnma@fedoraproject.org> 0.5.0.17
+- Minor Spec tweaks for review
+
+* Mon Oct 10 2008 Michael Stahnke <stahnma@fedoraproject.org> 0.5-0.16
+- Clean up for Fedora Review and submission
+
+* Wed Sep  3 2008 Jesus Rodriguez <jesusr@redhat.com> 0.5-0.15
+- remove reliance on external version file
+
+* Tue Oct 09 2007 Pradeep Kilambi <pkilambi@redhat.com>
+- clean dangling ports left out by jabberpy
+
+* Mon Jun 14 2004 Mihai Ibanescu <misa@redhat.com>
+- Initial build
+- Patched to add a __init__ file
diff --git a/sources b/sources
index e69de29..225a428 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+cbb9a1126bdc39ff49af605fb55c282e  jabberpy-0.5-0.tar.gz