diff --git a/hamlib-bindings.patch b/hamlib-bindings.patch
index d343d0b..1396217 100644
--- a/hamlib-bindings.patch
+++ b/hamlib-bindings.patch
@@ -14,7 +14,7 @@
  pyexecdir = @pyexecdir@
  
 -pythondir = $(prefix)/lib/python
-+pythondir = $(prefix)/lib/python2.3
++pythondir = $(libdir)/python2.3
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  subdirs = @subdirs@
diff --git a/hamlib.spec b/hamlib.spec
index 67abd48..afe7f0b 100644
--- a/hamlib.spec
+++ b/hamlib.spec
@@ -1,6 +1,8 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name: hamlib
 Version: 1.2.3
-Release: 7
+Release: 8
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transceivers and receivers
@@ -62,12 +64,13 @@ for building C++ applications with Hamlib.
 %package python
 Summary: Hamlib radio control library Python binding
 Group: Development/Libraries
+Requires: python-abi = %(%{__python} -c 'import sys;print(sys.version[:3])')
 
 %description python
 Hamlib Python Language bindings to allow radio control from Python scripts.
 
 %prep
-%setup
+%setup -q
 %patch -p1
 %patch1 -p1
 %build
@@ -109,6 +112,7 @@ make prefix=$RPM_BUILD_ROOT%{_prefix} \
         sharedstatedir=$RPM_BUILD_ROOT%{_sharedstatedir} \
         mandir=$RPM_BUILD_ROOT%{_mandir} \
         infodir=$RPM_BUILD_ROOT%{_infodir} \
+        pythondir=$RPM_BUILD_ROOT%{python_sitelib} \
    install-pythonPYTHON
 
 # Install PERL 
@@ -182,9 +186,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files python
 %defattr(-, root, root)
-%{_libdir}/python2.3/Hamlib.py
-%{_libdir}/python2.3/Hamlib.pyc
-%{_libdir}/python2.3/Hamlib.pyo
+%{python_sitelib}/*.py*
 
 %files devel
 %defattr(-, root, root)
@@ -201,6 +203,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 1.2.3-8
+- Added -q to %%setup
+- Fixed Python binding build and Requires
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 1.2.3-7
 - Removed spurious period and spelling mistake in Summary