diff --git a/debian/changelog b/debian/changelog
index 7ef0d2b9f5578329bb8d623885aef8b109c1f3d8..099e94dfd7101e86094ba950f12e79aa293ced6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-defaults (2.7.3-11) UNRELEASED; urgency=low
+
+  * Add Multi-Arch: same packages libpython-all-{dev,dbg} (not yet built,
+    python2.6 doesn't have support for multiarch).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 12 Dec 2012 00:25:00 +0100
+
 python-defaults (2.7.3-10) experimental; urgency=low
 
   * Build dependency packages as architecture dependent packages.
diff --git a/debian/control.in b/debian/control.in
index 6b2b709cd3caf0341fcfec68839f6b8672ea5ea3..40514e3fbe67d1d27911b73f5717a452a032f3d4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -170,3 +170,32 @@ Description: package depending on all supported Python debugging packages
  .
  This package is used as a build dependency for other packages to
  avoid hardcoded dependencies on specific Python development packages.
+
+#Package: libpython-all-dev
+#Architecture: any
+#Multi-Arch: same
+#Depends: libpython-dev (= ${binary:Version}), ${misc:Depends},
+# libpython2.7-dev
+#Description: package depending on all supported Python development packages
+# The package currently depends on libpython2.7-dev, in the
+# future, dependencies on jython (Python for a JVM) and ironpython (Python
+# for Mono) may be added.
+# .
+# This package is a dependency package used as a build dependency for other
+# packages to avoid hardcoded dependencies on specific Python development
+# packages.
+
+#Package: libpython-all-dbg
+#Architecture: any
+#Multi-Arch: same
+#Section: debug
+#Priority: extra
+#Depends: libpython-dbg (= ${binary:Version}), ${misc:Depends},
+# libpython2.7-dbg
+#Description: package depending on all supported Python debugging packages
+# The package currently depends on libpython2.7-dbg, in the
+# future, dependencies on jython (Python for a JVM) and ironpython (Python
+# for Mono) may be added.
+# .
+# This package is a dependency package used as a build dependency for other
+# packages to avoid hardcoded dependencies on specific Python debug packages.
diff --git a/debian/rules b/debian/rules
index 9e8cb7020109a9497d0f746dfc430a87fa5331bb..284221f588d077e11dcf2529566b32f165a5e7a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -358,6 +358,10 @@ endif
 	  rm -rf debian/$$p/usr/share/doc/$$p; \
 	  ln -sf python debian/$$p/usr/share/doc/$$p; \
 	done
+#	rm -rf debian/libpython-all-dev/usr/share/doc/libpython-all-dev
+#	ln -sf libpython-dev debian/libython3-all-dev/usr/share/doc/libpython-all-dev
+#	rm -rf debian/libpython-all-dbg/usr/share/doc/libpython-all-dev
+#	ln -sf libpython-dbg debian/libpython-all-dbg/usr/share/doc/libpython-all-dbg
 
 	dh_compress -a $(NOPKGS)
 	dh_fixperms -a $(NOPKGS)