diff -Nru telepathy-qt-0.9.6.1/debian/changelog telepathy-qt-0.9.6.1/debian/changelog
--- telepathy-qt-0.9.6.1/debian/changelog	2016-04-27 06:51:34.000000000 +0000
+++ telepathy-qt-0.9.6.1/debian/changelog	2016-08-23 03:06:24.000000000 +0000
@@ -1,3 +1,10 @@
+telepathy-qt (0.9.6.1-7ubuntu2) yakkety; urgency=medium
+
+  * Fix registering clients when using Qt >= 5.6.0
+  * Fix building the contacts-capabilities test using Qt >= 5.6.0
+
+ -- Gustavo Pichorim Boiko <gustavo.boiko@canonical.com>  Fri, 19 Aug 2016 10:59:24 -0300
+
 telepathy-qt (0.9.6.1-6ubuntu1) yakkety; urgency=medium
 
   * Take the complete package from Debian.
diff -Nru telepathy-qt-0.9.6.1/debian/control telepathy-qt-0.9.6.1/debian/control
--- telepathy-qt-0.9.6.1/debian/control	2016-04-27 06:50:37.000000000 +0000
+++ telepathy-qt-0.9.6.1/debian/control	2016-08-22 21:44:16.000000000 +0000
@@ -19,6 +19,7 @@
                libtelepathy-farstream-dev (>= 0.6.0),
                libtelepathy-glib-dev (>= 0.20.1),
                pkg-config,
+               pkg-kde-tools,
                python (>= 2.6),
                python-dev,
                qttools5-dev,
diff -Nru telepathy-qt-0.9.6.1/debian/patches/qt5.6_fix_contacts_capabilitites_test.patch telepathy-qt-0.9.6.1/debian/patches/qt5.6_fix_contacts_capabilitites_test.patch
--- telepathy-qt-0.9.6.1/debian/patches/qt5.6_fix_contacts_capabilitites_test.patch	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-qt-0.9.6.1/debian/patches/qt5.6_fix_contacts_capabilitites_test.patch	2016-08-23 02:41:42.000000000 +0000
@@ -0,0 +1,13 @@
+Index: telepathy-qt-0.9.6.1/tests/dbus/contacts-capabilities.cpp
+===================================================================
+--- telepathy-qt-0.9.6.1.orig/tests/dbus/contacts-capabilities.cpp
++++ telepathy-qt-0.9.6.1/tests/dbus/contacts-capabilities.cpp
+@@ -111,7 +111,7 @@ void TestContactsCapabilities::testCapab
+     QStringList ids = QStringList() << QLatin1String("alice")
+         << QLatin1String("bob") << QLatin1String("chris");
+ 
+-    gboolean supportTextChat[] = { TRUE, FALSE, FALSE };
++    bool supportTextChat[] = { true, false, false };
+ 
+     TpHandleRepoIface *serviceRepo =
+         tp_base_connection_get_handles(TP_BASE_CONNECTION(mConn->service()),
diff -Nru telepathy-qt-0.9.6.1/debian/patches/qtdbus_qt5.6.patch telepathy-qt-0.9.6.1/debian/patches/qtdbus_qt5.6.patch
--- telepathy-qt-0.9.6.1/debian/patches/qtdbus_qt5.6.patch	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-qt-0.9.6.1/debian/patches/qtdbus_qt5.6.patch	2016-08-23 03:14:17.000000000 +0000
@@ -0,0 +1,42 @@
+Index: telepathy-qt-0.9.6.1/TelepathyQt/client-registrar.cpp
+===================================================================
+--- telepathy-qt-0.9.6.1.orig/TelepathyQt/client-registrar.cpp
++++ telepathy-qt-0.9.6.1/TelepathyQt/client-registrar.cpp
+@@ -903,8 +903,7 @@ bool ClientRegistrar::registerClient(con
+                 .arg((quintptr) client.data(), 0, 16));
+     }
+ 
+-    if (mPriv->services.contains(busName) ||
+-        !mPriv->bus.registerService(busName)) {
++    if (mPriv->services.contains(busName)) {
+         warning() << "Unable to register client: busName" <<
+             busName << "already registered";
+         return false;
+@@ -950,7 +949,6 @@ bool ClientRegistrar::registerClient(con
+     if (interfaces.isEmpty()) {
+         warning() << "Client does not implement any known interface";
+         // cleanup
+-        mPriv->bus.unregisterService(busName);
+         return false;
+     }
+ 
+@@ -965,10 +963,18 @@ bool ClientRegistrar::registerClient(con
+             objectPath << "already registered";
+         // cleanup
+         delete object;
+-        mPriv->bus.unregisterService(busName);
+         return false;
+     }
+ 
++    if (!mPriv->bus.registerService(busName)) {
++        warning() << "Unable to register service: busName" <<
++            busName << "already registered";
++        mPriv->bus.unregisterObject(objectPath, QDBusConnection::UnregisterTree);
++        delete object;
++        return false;
++    }
++
++
+     if (handler) {
+         handler->setRegistered(true);
+     }
diff -Nru telepathy-qt-0.9.6.1/debian/patches/series telepathy-qt-0.9.6.1/debian/patches/series
--- telepathy-qt-0.9.6.1/debian/patches/series	2016-03-25 20:55:06.000000000 +0000
+++ telepathy-qt-0.9.6.1/debian/patches/series	2016-08-23 02:41:19.000000000 +0000
@@ -3,3 +3,5 @@
 gstreamer-1.5.patch
 force-service-pic.patch
 fix-deprecated-bsd-source.patch
+qtdbus_qt5.6.patch
+qt5.6_fix_contacts_capabilitites_test.patch