diff -Nru owncloud-client-2.2.4+dfsg/debian/changelog owncloud-client-2.2.4+dfsg/debian/changelog
--- owncloud-client-2.2.4+dfsg/debian/changelog	2016-11-19 13:51:12.000000000 +0000
+++ owncloud-client-2.2.4+dfsg/debian/changelog	2016-11-29 09:48:10.000000000 +0000
@@ -1,3 +1,10 @@
+owncloud-client (2.2.4+dfsg-2ubuntu1) zesty; urgency=medium
+
+  * Disable the dbustray workaround, it is not needed with Qt 5.6 and causes
+    issues under Unity (disable_dbustray_workaround.patch; LP: #1635577).
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Tue, 29 Nov 2016 12:48:10 +0300
+
 owncloud-client (2.2.4+dfsg-2) unstable; urgency=medium
 
   * FTBFS: Tests failures (Closes: 844937)
diff -Nru owncloud-client-2.2.4+dfsg/debian/patches/disable_dbustray_workaround.patch owncloud-client-2.2.4+dfsg/debian/patches/disable_dbustray_workaround.patch
--- owncloud-client-2.2.4+dfsg/debian/patches/disable_dbustray_workaround.patch	1970-01-01 00:00:00.000000000 +0000
+++ owncloud-client-2.2.4+dfsg/debian/patches/disable_dbustray_workaround.patch	2016-11-29 09:47:58.000000000 +0000
@@ -0,0 +1,20 @@
+Description: disable the dbustray workaround
+ It was needed only for Qt 5.5 (the two mentioned bugs are fixed in Qt 5.6),
+ and it causes problems on Unity (see https://launchpad.net/bugs/1635577).
+ .
+ This patch will be no longer needed with a new upstream release that
+ includes commit 98efb075357fa64f.
+Author: Dmitry Shachnev <mitya57@ubuntu.com>
+Last-Update: 2016-11-29
+
+--- a/src/gui/owncloudgui.cpp
++++ b/src/gui/owncloudgui.cpp
+@@ -466,7 +466,7 @@
+         // was introduced) instead of 5.5.0 to avoid issues where the Qt
+         // version used to build is different from the one used at runtime.
+ #ifdef Q_OS_LINUX
+-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++#if 0
+         QObject* platformMenu = reinterpret_cast<QObject*>(_tray->contextMenu()->platformMenu());
+         if (platformMenu
+                 && platformMenu->metaObject()->className() == QLatin1String("QDBusPlatformMenu")) {
diff -Nru owncloud-client-2.2.4+dfsg/debian/patches/series owncloud-client-2.2.4+dfsg/debian/patches/series
--- owncloud-client-2.2.4+dfsg/debian/patches/series	2016-11-19 13:19:43.000000000 +0000
+++ owncloud-client-2.2.4+dfsg/debian/patches/series	2016-11-29 09:42:43.000000000 +0000
@@ -9,3 +9,4 @@
 0009-fix-installpath-of-dolphin-plugin.patch
 0010-fix-build-with-openssl1.1.0b.patch
 0011-fix-tests.patch
+disable_dbustray_workaround.patch