diff --git a/debian/changelog b/debian/changelog
index 4f691f6..1b13c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ubuntu-dev-tools (0.92) UNRELEASED; urgency=low
+
+  * ubuntutools/requestsync/mail.py:
+    Map "sid" back to "unstable" (and "squeeze" to "testing") else rmadison
+    gets a Python traceback from the remote site instead of the expected data
+    (lp: #508794).
+
+ -- Michael Bienia <geser@ubuntu.com>  Sun, 17 Jan 2010 17:53:57 +0100
+
 ubuntu-dev-tools (0.91) lucid; urgency=low
 
   * mk-sbuild-lv: drop deprecated keys from schroot.conf template
diff --git a/ubuntutools/requestsync/mail.py b/ubuntutools/requestsync/mail.py
index 95fc5d9..2e2d2b1 100644
--- a/ubuntutools/requestsync/mail.py
+++ b/ubuntutools/requestsync/mail.py
@@ -57,6 +57,14 @@ class SourcePackagePublishingHistory(object):
 		return self.component
 
 def rmadison(distro, package, release):
+	# Map 'sid' and 'squeeze' to their releasenames else rmadison gets a python
+	# traceback back from the remote script
+	releasenames = {
+		'sid': 'unstable',
+		'squeeze': 'testing', # Needs updating after each Debian release
+	}
+	release = releasenames.get(release, release)
+
 	rmadison_cmd = subprocess.Popen(
 		['rmadison', '-u', distro, '-a', 'source', '-s', release, package],
 		stdout = subprocess.PIPE)