diff --git a/debian/changelog b/debian/changelog
index 9e2e02d..881d797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 ubuntu-dev-tools (0.121) UNRELEASED; urgency=low
 
+  [ Daniel Holbach ]
   * harvest, setup.py: install tool that queries Harvest for information
     about open opportunities for a given source package.
 
+  [ Stefano Rivera ]
+  * ubuntutools.archive.rmadison: suite can be None, handle this correctly.
+
  -- Daniel Holbach <daniel.holbach@ubuntu.com>  Mon, 21 Mar 2011 12:24:56 +0100
 
 ubuntu-dev-tools (0.120) unstable; urgency=low
diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py
index 47ad0fb..94f8d48 100644
--- a/ubuntutools/archive.py
+++ b/ubuntutools/archive.py
@@ -522,7 +522,8 @@ def rmadison(url, package, suite=None, arch=None):
     assert process.wait() == 0
 
     # rmadison uses some shorthand
-    suite = suite.replace('-proposed-updates', '-p-u')
+    if suite:
+        suite = suite.replace('-proposed-updates', '-p-u')
 
     for line in output.strip().splitlines():
         pkg, ver, dist, archs = [x.strip() for x in line.split('|')]
@@ -534,7 +535,7 @@ def rmadison(url, package, suite=None, arch=None):
         # rmadison returns some results outside the requested set.
         # It'll include backports, and when given an unknown suite,
         # it ignores that argument
-        if dist != suite:
+        if suite and dist != suite:
             continue
 
         if 'source' in archs: