diff -pruN 6.0.3+dfsg-2/debian/changelog 6.0.3+dfsg-2ubuntu1/debian/changelog
--- 6.0.3+dfsg-2/debian/changelog	2014-04-29 18:33:39.000000000 +0000
+++ 6.0.3+dfsg-2ubuntu1/debian/changelog	2014-06-01 22:27:24.000000000 +0000
@@ -1,3 +1,11 @@
+owncloud (6.0.3+dfsg-2ubuntu1) utopic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+   - Alternatively depend on zend-framework (see Debian bug #688033\
+     and LP bug #1052423).
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Sun, 01 Jun 2014 18:27:03 -0400
+
 owncloud (6.0.3+dfsg-2) unstable; urgency=medium
 
   * Upload to unstable
@@ -75,6 +83,13 @@ owncloud (6.0.2~rc1+dfsg-1) experimental
 
  -- David Prévot <taffit@debian.org>  Wed, 26 Feb 2014 11:13:18 -0400
 
+owncloud (6.0.1+dfsg-1ubuntu1) trusty; urgency=medium
+
+  * Alternatively depend on zend-framework (see Debian bug #688033 and
+    LP bug #1052423).
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sun, 26 Jan 2014 01:03:31 +0100
+
 owncloud (6.0.1+dfsg-1) unstable; urgency=low
 
   [ Frank Karlitschek ]
@@ -846,3 +861,4 @@ owncloud (2.0.0-1) unstable; urgency=low
   * simple apache config file added
 
  -- Thomas Mueller <thomas.mueller@tmit.eu>  Mon, 14 Nov 2011 00:16:17 +0100
+
diff -pruN 6.0.3+dfsg-2/debian/control 6.0.3+dfsg-2ubuntu1/debian/control
--- 6.0.3+dfsg-2/debian/control	2014-04-29 03:47:45.000000000 +0000
+++ 6.0.3+dfsg-2ubuntu1/debian/control	2014-04-29 23:32:29.000000000 +0000
@@ -1,7 +1,8 @@
 Source: owncloud
 Section: web
 Priority: extra
-Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers@lists.alioth.debian.org>
 Uploaders: Thomas Mueller <thomas.mueller@tmit.eu>,
            David Prévot <taffit@debian.org>,
            Paul van Tilburg <paulvt@debian.org>
@@ -44,7 +45,7 @@ Depends: apache2 | httpd,
          php5-gd,
          php5-json,
          php5-mysql | php5-pgsql | php5-sqlite,
-         zendframework,
+         zend-framework | zendframework,
          ${misc:Depends}
 Recommends: exim4 | mail-transport-agent,
             libav-tools,
