diff -Nru aethercast-0.1+16.10.20160808/debian/changelog aethercast-0.1+16.10.20160808/debian/changelog
--- aethercast-0.1+16.10.20160808/debian/changelog	2016-11-01 16:07:20.000000000 +0000
+++ aethercast-0.1+16.10.20160808/debian/changelog	2017-03-22 09:42:35.000000000 +0000
@@ -1,3 +1,12 @@
+aethercast (0.1+16.10.20160808-0ubuntu5) zesty; urgency=medium
+
+  * Build-depend on googletest instead of google-mock and libgtest-dev
+  * Don't FTBFS with google-mock installed (LP: #1640317)
+  * Pass multiarch path in  CMAKE_INSTALL_LIBDIR
+  * Don't ship google test files in binary packages
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 22 Mar 2017 09:42:35 +0000
+
 aethercast (0.1+16.10.20160808-0ubuntu4) zesty; urgency=high
 
   * No change rebuild against boost1.62.
diff -Nru aethercast-0.1+16.10.20160808/debian/control aethercast-0.1+16.10.20160808/debian/control
--- aethercast-0.1+16.10.20160808/debian/control	2016-08-08 09:00:29.000000000 +0000
+++ aethercast-0.1+16.10.20160808/debian/control	2017-03-22 09:42:35.000000000 +0000
@@ -8,7 +8,7 @@
                debhelper (>= 9),
                dh-apparmor,
                dbus,
-               google-mock,
+               googletest,
                libboost-dev,
                libboost-filesystem-dev,
                libboost-log-dev,
@@ -19,7 +19,6 @@
 # thread-specific storage locations.
                libboost-thread-dev,
                libglib2.0-dev,
-               libgtest-dev,
                libhybris-dev,
                liblttng-ust-dev,
                libmedia-dev,
diff -Nru aethercast-0.1+16.10.20160808/debian/patches/0001-Build-with-latest-googlemock-paths-LP-1640317.patch aethercast-0.1+16.10.20160808/debian/patches/0001-Build-with-latest-googlemock-paths-LP-1640317.patch
--- aethercast-0.1+16.10.20160808/debian/patches/0001-Build-with-latest-googlemock-paths-LP-1640317.patch	1970-01-01 00:00:00.000000000 +0000
+++ aethercast-0.1+16.10.20160808/debian/patches/0001-Build-with-latest-googlemock-paths-LP-1640317.patch	2017-03-22 09:42:35.000000000 +0000
@@ -0,0 +1,37 @@
+From 554d64de5b11b973a67b61bdb6a6b5799a910a02 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint.reczey@canonical.com>
+Date: Wed, 22 Mar 2017 10:12:59 +0100
+Subject: [PATCH] Build with latest googlemock paths (LP: #1640317)
+
+---
+ CMakeLists.txt | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b6cc243..6458b86 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -88,8 +88,19 @@ IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+ ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+ 
+ # Build with system gmock and embedded gtest
++
++# Include dir may be just /usr/include which is searched by default but
++# adding this one for compatibility with older versions
+ set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
+-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
++
++# Use new path of googlemock when it exists
++IF(EXISTS /usr/src/googletest/googlemock)
++  set (GMOCK_SOURCE_DIR "/usr/src/googletest/googlemock" CACHE PATH "gmock source directory")
++ELSE()
++  set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
++ENDIF()
++
++# this may be just /usr/include as well
+ set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
+ 
+ add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+-- 
+2.7.4
+
diff -Nru aethercast-0.1+16.10.20160808/debian/patches/series aethercast-0.1+16.10.20160808/debian/patches/series
--- aethercast-0.1+16.10.20160808/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ aethercast-0.1+16.10.20160808/debian/patches/series	2017-03-22 09:42:35.000000000 +0000
@@ -0,0 +1 @@
+0001-Build-with-latest-googlemock-paths-LP-1640317.patch
diff -Nru aethercast-0.1+16.10.20160808/debian/rules aethercast-0.1+16.10.20160808/debian/rules
--- aethercast-0.1+16.10.20160808/debian/rules	2016-08-08 09:00:29.000000000 +0000
+++ aethercast-0.1+16.10.20160808/debian/rules	2017-03-22 09:42:35.000000000 +0000
@@ -18,6 +18,11 @@
 %:
 	dh $@ --parallel --fail-missing
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+
+# remove google test files before installing files to packages
 override_dh_install:
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/lib* $(CURDIR)/debian/tmp/usr/include
 	dh_install
 	dh_apparmor -paethercast --profile-name=usr.sbin.dhcpd