diff --git a/ldns.spec b/ldns.spec
index 1570a38..953f725 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -1,6 +1,13 @@
+%{?!with_python:      %global with_python      1}
+
+%if %{with_python}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%endif
+
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.6.3
+Version: 1.6.4
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
@@ -10,6 +17,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, autoconf, automake, gcc-c++, doxygen,
 BuildRequires: perl, libpcap-devel, openssl-devel
 
+%if %{with_python}
+BuildRequires:  python-devel, swig
+%endif
+
 %description
 ldns is a library with the aim to simplify DNS programing in C. All
 lowlevel DNS/DNSSEC operations are supported. We also define a higher
@@ -24,6 +35,17 @@ Requires: %{name} = %{version}-%{release}
 %description devel
 The devel package contains the ldns library and the include files
 
+%if %{with_python}
+%package python
+Summary: Python extensions for ldns
+Group: Applications/System
+Requires: %{name}-libs = %{version}-%{release}
+
+%description python
+Python extensions for ldns
+%endif
+
+
 %prep
 %setup -q 
 # To built svn snapshots
@@ -32,7 +54,11 @@ The devel package contains the ldns library and the include files
 #autoreconf
 
 %build
-%configure --disable-rpath --with-sha2 
+%configure --disable-rpath --with-sha2 \
+%if %{with_python}
+ --with-pyldns
+%endif
+
 (cd drill ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/ )
 (cd examples ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/ )
 
@@ -47,6 +73,11 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install 
 make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install-doc
 
+%if %{with_python}
+# remove execute perms from python files
+chmod a-x %{buildroot}%{python_sitelib}/ldns/*py
+%endif
+
 # don't package building script in doc
 rm doc/doxyparse.pl
 #remove doc stubs
@@ -55,7 +86,7 @@ rm -rf doc/.svn
 rm -rf doc/man
 
 # remove .la files
-rm -rf %{buildroot}%{_libdir}/*.la
+rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitelib}/*.la
 (cd drill ; make DESTDIR=%{buildroot} install)
 (cd examples; make DESTDIR=%{buildroot} install)
 
@@ -83,11 +114,21 @@ rm -rf %{buildroot}
 %{_includedir}/ldns/*.h
 %doc doc Changelog README
 
+%if %{with_python}
+%files python
+%defattr(-,root,root)
+%{python_sitelib}/*
+%endif
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 20 2010 Paul Wouters <paul@xelerance.com> - 1.6.4-1
+- Upgraded to 1.6.4. 
+- Added ldns-python sub package
+
 * Fri Dec 04 2009 Paul Wouters <paul@xelerance.com> - 1.6.3-1
 - Upgraded to 1.6.3, which has minor bugfixes