diff --git a/libuser.spec b/libuser.spec
index 906e4b8..e7ac372 100644
--- a/libuser.spec
+++ b/libuser.spec
@@ -5,9 +5,9 @@
 
 Name: libuser
 Version: 0.56.4
-Release: 1
+Release: 2
 Group: System Environment/Base
-License: LGPL
+License: LGPLv2+
 Source: libuser-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt, python-devel
@@ -35,6 +35,16 @@ Requires: glib2-devel
 The libuser-devel package contains header files, static libraries, and other
 files useful for developing applications with libuser.
 
+%package python
+Summary: Python bindings for the libuser library
+Group: Development/Libraries
+Requires: libuser = %{version}-%{release}
+
+%description python
+The libuser-python package contains the Python bindings for
+the libuser library, which provides a Python API for manipulating and
+administering user and group accounts.
+
 %prep
 %setup -q
 
@@ -70,11 +80,10 @@ popd
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README TODO docs/*.txt python/modules.txt
+%doc AUTHORS COPYING NEWS README TODO docs/*.txt
 %config(noreplace) %{_sysconfdir}/libuser.conf
 
 %attr(0755,root,root) %{_bindir}/*
-%{python_sitearch}/*.so
 %{_libdir}/*.so.*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so
@@ -84,6 +93,11 @@ popd
 
 %exclude %{_libdir}/*.la
 %exclude %{_libdir}/%{name}/*.la
+
+%files python
+%defattr(-,root,root)
+%doc python/modules.txt
+%{python_sitearch}/*.so
 %exclude %{python_sitearch}/*.la
 
 %files devel
@@ -94,6 +108,11 @@ popd
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Aug  8 2007 Miloslav Trmač <mitr@redhat.com> - 0.56.4-2
+- Split the Python module to a separate subpackage (original patch by Yanko
+  Kaneti)
+- Update the License: tag
+
 * Fri Jun 15 2007 Miloslav Trmač <mitr@redhat.com> - 0.56.4-1
 - Update the last password change date field when changing passwords
   Resolves: #243854