diff -u midori-0.1.1/debian/midori.postinst midori-0.1.1/debian/midori.postinst
--- midori-0.1.1/debian/midori.postinst
+++ midori-0.1.1/debian/midori.postinst
@@ -4,7 +4,7 @@
     configure)
         update-alternatives \
             --install /usr/bin/x-www-browser \
-            x-www-browser /usr/bin/midori 90  \
+            x-www-browser /usr/bin/midori 1  \
             --slave /usr/share/man/man1/x-www-browser.1.gz \
             x-www-browser.1.gz /usr/share/man/man1/midori.1.gz
         ;;
diff -u midori-0.1.1/debian/changelog midori-0.1.1/debian/changelog
--- midori-0.1.1/debian/changelog
+++ midori-0.1.1/debian/changelog
@@ -1,3 +1,16 @@
+midori (0.1.1-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #311126), Ubuntu remaining changes:
+    - debian/rules:
+     + Added CDBS patch system support.
+    - debian/postinst:
+     + Changed update-alternatives priority to make midori be
+       browser of last resort due to its immaturity.
+    - debian/patches/01_default-homepage.patch:
+     + Default homepage now is Ubuntu homepage.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Wed, 24 Dec 2008 10:12:32 +0100
+
 midori (0.1.1-1) unstable; urgency=low
 
   * New upstream release.  From upstream's blog post:
@@ -23,6 +36,20 @@
 
  -- Trent W. Buck <trentbuck@gmail.com>  Sat, 13 Dec 2008 18:00:06 +1100
 
+midori (0.1.0-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian, remaining changes are as follows:
+    - debian/postinst:
+       - Changes update-alternatives priority to make midori be 
+         browser of last resort due the inmaturity of midori as 
+         a day to day webbrowser (LP: #274238)
+    - debian/patches/01_default-homepage.patch: 
+       - change default to Ubuntu homepage
+    - debian/rules:
+       - enabled CDBS simple patch system
+
+ -- Michael Casadevall <sonicmctails@gmail.com>  Sun, 02 Nov 2008 23:46:39 -0500
+
 midori (0.1.0-1) unstable; urgency=low
 
   * New upstream release
@@ -98,6 +125,32 @@
 
  -- Trent W. Buck <trentbuck@gmail.com>  Sat, 07 Jun 2008 15:00:06 +1000
 
+midori (0.0.18-0ubuntu2) intrepid; urgency=low
+
+  * Changed postinst to make midori be the browser
+    of last resort so to speak since it is still greatly
+    unstable and not usuable for day to day browing yet (LP: #274238)
+
+ -- Michael Casadevall <sonicmctails@gmail.com>  Wed, 24 Sep 2008 23:04:09 -0400
+
+midori (0.0.18-0ubuntu1) intrepid; urgency=low
+
+  * New upstream release. (Debian package is currently orphaned.)
+  * debian/control: Build-depend on libwebkit-dev instead of libwebkitgtk-dev.
+  * Updated 01_default-homepage.patch for this release.
+
+ -- Matvey Kozhev <sikon@ubuntu.com>  Sun, 18 May 2008 19:15:05 +0700
+
+midori (0.0.17-1ubuntu1) hardy; urgency=low
+
+  * debian/patches/01-default_homepage.patch:
+    - Changed default homepage from debian.org to the default Ubuntu one
+      (file:///usr/share/ubuntu-artwork/home/index.html). (LP: #193369)
+  * debian/control:
+    - Set maintainer field per Ubuntu specification.
+
+ -- Matvey Kozhev <sikon@ubuntu.com>  Thu, 21 Feb 2008 19:31:48 +0600
+
 midori (0.0.17-1) experimental; urgency=low
 
   * New upstream release. Closes: #457392
@@ -155,0 +209 @@
+
diff -u midori-0.1.1/debian/control midori-0.1.1/debian/control
--- midori-0.1.1/debian/control
+++ midori-0.1.1/debian/control
@@ -1,7 +1,8 @@
 Source: midori
 Section: web
 Priority: optional
-Maintainer: William Pitcock <nenolod@sacredspiral.co.uk>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: William Pitcock <nenolod@sacredspiral.co.uk>
 Uploaders: Trent W. Buck <trentbuck@gmail.com>, Patrick Winnertz <winnie@debian.org>
 DM-Upload-Allowed: yes
 Build-Depends:
diff -u midori-0.1.1/debian/rules midori-0.1.1/debian/rules
--- midori-0.1.1/debian/rules
+++ midori-0.1.1/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_DH_STRIP_ARGS := --dbg-package=midori-dbg
 
--- midori-0.1.1.orig/debian/patches/01_default-homepage.patch
+++ midori-0.1.1/debian/patches/01_default-homepage.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' midori-0.1.0/midori/midori-websettings.c midori-0.1.0.new/midori/midori-websettings.c
+--- midori-0.1.0/midori/midori-websettings.c	2008-10-18 18:46:44.000000000 -0400
++++ midori-0.1.0.new/midori/midori-websettings.c	2008-11-03 00:00:27.000000000 -0500
+@@ -431,7 +431,7 @@
+                                      "homepage",
+                                      _("Homepage"),
+                                      _("The homepage"),
+-                                     "http://www.google.com",
++                                     "file:///usr/share/ubuntu-artwork/home/index.html",
+                                      flags));
+ 
+     g_object_class_install_property (gobject_class,