diff --git a/debian/changelog b/debian/changelog
index 3660016..6e8b62c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,12 +18,13 @@ ubuntu-dev-tools (0.100) UNRELEASED; urgency=low
   * syncpackage:
    - add more options and allow pulling packages from Debian.
    - add mismatching source tarball detection (for fake syncs).
-  
+  * update-maintainer: Remove duplicate Original-Maintainer field.
+
   [ Michael Vogt ]
   * edit-patch:
     - support full path to the patch as well (LP: #585599)
 
- -- Benjamin Drung <bdrung@ubuntu.com>  Sat, 15 May 2010 17:55:22 +0200
+ -- Benjamin Drung <bdrung@ubuntu.com>  Thu, 03 Jun 2010 21:32:01 +0200
 
 ubuntu-dev-tools (0.99) lucid; urgency=low
 
diff --git a/update-maintainer b/update-maintainer
index 1d3e822..4cd4bad 100755
--- a/update-maintainer
+++ b/update-maintainer
@@ -95,6 +95,13 @@ original_maintainer = maintainer_name + " " + maintainer_mail
 # XSBC-Original maintainer field
 
 if not "lists.ubuntu.com" in original_maintainer:
+	# Remove existing Original-Maintainer field
+	# to avoid multiple Original-Maintainer fields
+	original_maintainer_fields = re.findall('(.*Original-Maintainer): (.*)', file_contents)
+	if len(original_maintainer_fields) > 0:
+		for original_maintainer_field in original_maintainer_fields:
+			print "Removing existing %s: %s" % original_maintainer_field
+		file_contents = re.sub('.*Original-Maintainer: .*\n', "", file_contents)
 	final_addition = target_maintainer + "\nXSBC-Original-Maintainer: " + original_maintainer
 else:
 	final_addition = target_maintainer