diff -Nru jbigkit-2.1/debian/changelog jbigkit-2.1/debian/changelog
--- jbigkit-2.1/debian/changelog	2014-10-08 08:09:47.000000000 +0000
+++ jbigkit-2.1/debian/changelog	2014-10-13 19:08:11.000000000 +0000
@@ -1,9 +1,9 @@
-jbigkit (2.1-3ubuntu1) utopic; urgency=medium
+jbigkit (2.1-3.1) unstable; urgency=medium
 
-  * Merge with Debian; remaining changes:
-    - Allow the package to cross build, remove libtool usage. Closes: #761760.
+  * Non maintainer upload.
+  * Allow the package to cross build, remove libtool usage. Closes: #761760.
 
- -- Matthias Klose <doko@ubuntu.com>  Wed, 08 Oct 2014 09:15:05 +0200
+ -- Matthias Klose <doko@debian.org>  Mon, 13 Oct 2014 21:07:40 +0200
 
 jbigkit (2.1-3) unstable; urgency=low
 
@@ -42,50 +42,6 @@
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Sun, 20 Apr 2014 16:37:42 +0200
 
-jbigkit (2.0-2ubuntu5) utopic; urgency=medium
-
-  * debian/patches/allNewMainMakefile.diff: don't use install -s.  Binaries
-    should be stripped after install as an optional part of the package
-    build.
-
- -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 09 Jul 2014 23:16:54 -0700
-
-jbigkit (2.0-2ubuntu4.1) trusty-security; urgency=medium
-
-  * SECURITY UPDATE: denial of service or possible code execution in
-    libjbig
-    - debian/patches/CVE-2013-6369.patch: check sizes in libjbig/jbig.c.
-    - CVE-2013-6369
-
- -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Tue, 15 Apr 2014 14:41:53 -0400
-
-jbigkit (2.0-2ubuntu4) trusty; urgency=low
-
-  * libjbig0.symbols: Fix symbols file to refer to the right library.
-
- -- Adam Conrad <adconrad@ubuntu.com>  Wed, 11 Dec 2013 02:14:44 -0700
-
-jbigkit (2.0-2ubuntu3) trusty; urgency=low
-
-  * Fix header include.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 07 Dec 2013 19:25:40 +0100
-
-jbigkit (2.0-2ubuntu2) trusty; urgency=medium
-
-  * Allow the package to cross build, remove wrong libtool usage.
-  * Build using hardening defaults.
-  * Add a symbols file.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 07 Dec 2013 19:00:45 +0100
-
-jbigkit (2.0-2ubuntu1) quantal; urgency=low
-
-  * Fix a number of compiler warnings per feedback from Ubuntu security team
-    (LP: #993304).
-
- -- Colin Watson <cjwatson@ubuntu.com>  Mon, 09 Jul 2012 11:57:58 +0100
-
 jbigkit (2.0-2) unstable; urgency=low
 
   * Correct typo in new Makefile, so that libjbig.so now points to a file
diff -Nru jbigkit-2.1/debian/control jbigkit-2.1/debian/control
--- jbigkit-2.1/debian/control	2014-10-08 07:56:44.000000000 +0000
+++ jbigkit-2.1/debian/control	2014-10-13 19:08:35.000000000 +0000
@@ -1,7 +1,6 @@
 Source: jbigkit
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Michael van der Kolff <mvanderkolff@gmail.com>
+Maintainer: Michael van der Kolff <mvanderkolff@gmail.com>
 Build-Depends: debhelper (>=8.1.3)
 Standards-Version: 3.9.5
 Section: libs