diff --git a/debian/changelog b/debian/changelog
index 1e8975624ed8ef522138efbf4c22d12f7324a2eb..08cc3226512061664a1e35ea16f03910bf37f743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 python-defaults (2.6.6-2) UNRELEASED; urgency=low
 
+  [ Piotr Ożarowski ]
   * Add README.derivatives (source package)
   * dh_python2:
     - add dist_fallback file with a list of Python distribution name and
@@ -12,6 +13,10 @@ python-defaults (2.6.6-2) UNRELEASED; urgency=low
   * use /usr/bin/python rather than python in python-minimal.postinst
     (closes: 595826)
 
+  [ Matthias Klose ]
+  * python.mk (py_libdir): Return /usr/lib/python3/dist-packages for 3.x
+    versions.
+
  -- Piotr Ożarowski <piotr@debian.org>  Thu, 02 Sep 2010 19:18:26 +0200
 
 python-defaults (2.6.6-1) unstable; urgency=low
diff --git a/debian/python.mk b/debian/python.mk
index 94e1a0574e64741d0bedaa6a91df2b9759a0e9e6..f0e66c15782126f5b5d437b769c89c5036eca765 100644
--- a/debian/python.mk
+++ b/debian/python.mk
@@ -23,7 +23,7 @@ py_sitename = $(if $(filter $(subst python,,$(1)), 2.3 2.4 2.5),site,dist)-packa
 # stuff. Call as: $(call py_libdir, <python version>).
 # Don't use this in shell snippets inside loops.
 
-py_libdir = /usr/lib/python$(subst python,,$(1))/$(py_sitename)
+py_libdir = /usr/lib/python$(strip $(if $(findstring 3.,$(subst python,,$(1))),3,$(subst python,,$(1))))/$(py_sitename)
 
 
 # The same macros for use inside loops in shell snippets