diff --git a/debian/changelog b/debian/changelog
index 9c67775..afeced3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,12 @@ ubuntu-dev-tools (0.130) UNRELEASED; urgency=low
 
   * pull-lp-source: Support source packages with a bad version string
     (LP: #844682).
-  * backportpackage: Search for newer versions in -{updates,security} on Ubuntu
-    (LP: #823833).
+  * backportpackage:
+    - Search for newer versions in -{updates,security} on Ubuntu (LP: #823833).
+    - Use Ubuntu and Debian as fall back check in codename_to_distribution to
+      allow backporting to Ubuntu from a Debian system (LP: #823832).
 
- -- Benjamin Drung <bdrung@debian.org>  Thu, 08 Sep 2011 17:25:21 +0200
+ -- Benjamin Drung <bdrung@debian.org>  Thu, 08 Sep 2011 18:10:57 +0200
 
 ubuntu-dev-tools (0.129) unstable; urgency=low
 
diff --git a/ubuntutools/misc.py b/ubuntutools/misc.py
index f9fe175..ea5a5de 100644
--- a/ubuntutools/misc.py
+++ b/ubuntutools/misc.py
@@ -172,7 +172,7 @@ def codename_to_distribution(codename):
     (i.e. looking at the current distribution and its parents), or
     print an error message and return None if it can't be found
     """
-    for distro in system_distribution_chain():
+    for distro in system_distribution_chain() + ["Ubuntu", "Debian"]:
         info = vendor_to_distroinfo(distro)
         if not info:
             continue