diff -u distcc-3.1/debian/rules distcc-3.1/debian/rules
--- distcc-3.1/debian/rules
+++ distcc-3.1/debian/rules
@@ -44,7 +44,8 @@
 				--sysconfdir=/etc \
 				--with-gnome \
 				--enable-rfc2553 \
-				--disable-Werror
+				--disable-Werror \
+				PYTHON=$(shell which `pyversions -d`)
 
 #Architecture 
 build: patch-stamp build-arch build-indep
diff -u distcc-3.1/debian/patches/04_fix_pumps_include_server_path.dpatch distcc-3.1/debian/patches/04_fix_pumps_include_server_path.dpatch
--- distcc-3.1/debian/patches/04_fix_pumps_include_server_path.dpatch
+++ distcc-3.1/debian/patches/04_fix_pumps_include_server_path.dpatch
@@ -1,5 +1,6 @@
 #! /bin/sh -e
-## 03_do_not_install_redhat_config.dpatch by Carsten Wolff <carsten@wolffcarsten.de>
+## 04_fix_pumps_include_server_path.dpatch by Carsten Wolff <carsten@wolffcarsten.de>
+## Update to use private module path by Daniel Hartwig <mandyke@gmail.com>
 
 if [ $# -ne 1 ]; then
     echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
@@ -18,12 +19,21 @@
 @DPATCH@
 --- distcc-3.1.orig/source/Makefile.in
 +++ distcc-3.1/source/Makefile.in
+@@ -1049,7 +1049,7 @@
+ 	        --build-base="$(include_server_builddir)" \
+ 	        --build-temp="$(include_server_builddir)" \
+ 	      install 					\
+-	         --prefix="$(prefix)" 			\
++	         --install-lib="$(prefix)/lib/distcc-pump" \
+ 	         --record="$(include_server_builddir)/install.log.pre" \
+ 	         --root="$$DESTDIR"                     \
+ 	    || exit 1; \
 @@ -1061,7 +1061,7 @@
  	    cp -f "$(include_server_builddir)/install.log" "$(PYTHON_INSTALL_RECORD)"; \
  	  fi; \
  	  $(mkinstalldirs) "$(DESTDIR)$(bindir)" && \
 -	  INCLUDE_SERVER=`grep '/include_server.py$$' "$(include_server_builddir)/install.log"` && \
-+	  INCLUDE_SERVER=`echo "/usr/lib/pymodules/python2.5/include_server/include_server.py" | sed "s,bin,lib,"` && \
++	  INCLUDE_SERVER="/usr/lib/distcc-pump/include_server/include_server.py" && \
  	  sed "s,^include_server='',include_server='$$INCLUDE_SERVER'," \
  	    pump > "$(include_server_builddir)/pump" && \
  	  $(INSTALL_PROGRAM) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \