diff -u asciidoc-8.5.2/debian/changelog asciidoc-8.5.2/debian/changelog
--- asciidoc-8.5.2/debian/changelog
+++ asciidoc-8.5.2/debian/changelog
@@ -1,3 +1,10 @@
+asciidoc (8.5.2-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes: LP: #507359
+    - Drop Recommends of source-highlight and vim-addon-manager to Suggests.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Thu, 14 Jan 2010 13:15:37 +0530
+
 asciidoc (8.5.2-1) unstable; urgency=low
 
   * New upstream version 
@@ -8,6 +15,14 @@
 
  -- Alexander Wirt <formorer@debian.org>  Sat, 02 Jan 2010 10:11:17 +0100
 
+asciidoc (8.5.1-1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian testing.
+  * Remaining Ubuntu changes:
+    - Drop Recommends of source-highlight and vim-addon-manager to Suggests.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Sat, 14 Nov 2009 15:41:13 -0600
+
 asciidoc (8.5.1-1) unstable; urgency=low
 
   * New upstream version (Closes: #531841)
@@ -15,6 +30,15 @@
 
  -- Alexander Wirt <formorer@debian.org>  Wed, 10 Jun 2009 21:11:19 +0200
 
+asciidoc (8.4.4-1ubuntu1) karmic; urgency=low
+
+  * Synchronize with Debian; remaining Ubuntu changes:
+    - Drop recommends of source-highlight and vim-addon-manager to suggests.
+      While they do seem useful, they are in universe and have some more
+      universe dependencies.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 28 Apr 2009 17:32:20 +0200
+
 asciidoc (8.4.4-1) unstable; urgency=low
 
   * New upstream release (Closes: #511332)
diff -u asciidoc-8.5.2/debian/control asciidoc-8.5.2/debian/control
--- asciidoc-8.5.2/debian/control
+++ asciidoc-8.5.2/debian/control
@@ -1,7 +1,8 @@
 Source: asciidoc
 Section: text
 Priority: optional
-Maintainer: Fredrik Steen <stone@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Fredrik Steen <stone@debian.org>
 Uploaders: Alexander Wirt <formorer@debian.org>
 Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5) 
 Build-Depends-Indep: patchutils (>= 0.2.25), xmlto, python (>= 2.3)
@@ -10,7 +11,8 @@
 Package: asciidoc
 Architecture: all
 Depends: python (>= 2.3), ${misc:Depends}
-Recommends: docbook-utils, xmlto, dblatex, source-highlight, vim-addon-manager,libxml2-utils 
+Recommends: docbook-utils, xmlto, dblatex, libxml2-utils
+Suggests: source-highlight, vim-addon-manager
 Description: Highly configurable text format for writing documentation
  AsciiDoc is a text document format for writing articles, books, manuals and
  UNIX man pages. AsciiDoc files can be translated to HTML (with or without