diff -Nru nux-4.0.8+17.10.20180613.2/debian/50_check_unity_support nux-4.0.8+17.10.20180613.3/debian/50_check_unity_support
--- nux-4.0.8+17.10.20180613.2/debian/50_check_unity_support	1970-01-01 00:00:00.000000000 +0000
+++ nux-4.0.8+17.10.20180613.3/debian/50_check_unity_support	2018-06-13 12:24:15.000000000 +0000
@@ -0,0 +1,19 @@
+# This file is sourced by Xsession(5), not executed.
+# If the hardware does not pass unity_support_test, fall back to LLVMpipe
+# which does.
+
+if [ "x$DESKTOP_SESSION" = "xubuntu" ] && [ -x "/usr/lib/nux/unity_support_test" ]; then
+    (
+        IFS=':'
+        for d in $XDG_CURRENT_DESKTOP; do
+            if [ "x$d" = "xUnity" ] || [ "x$d" = "xUnity7" ]; then
+                return 0
+            fi
+        done
+        return 1
+    )
+
+    if [ $? = 0 ]; then
+        /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1
+    fi
+fi
diff -Nru nux-4.0.8+17.10.20180613.2/debian/changelog nux-4.0.8+17.10.20180613.3/debian/changelog
--- nux-4.0.8+17.10.20180613.2/debian/changelog	2018-06-13 12:24:15.000000000 +0000
+++ nux-4.0.8+17.10.20180613.3/debian/changelog	2018-06-13 12:24:15.000000000 +0000
@@ -1,21 +1,11 @@
-nux (4.0.8+17.10.20180613.2-0ubuntu1) artful; urgency=medium
+nux (4.0.8+17.10.20180613.3-0ubuntu1) artful; urgency=medium
 
   * debian/50_check_unity_support:
-    - renamed to X11-check-unity-support
-  * debian/X11-check-unity-support:
     - various changes to fix (LP: #1768610):
       + export LIBGL_ALWAYS_SOFTWARE=1 only on command failure
       + run only when called inside an unity session
-    - install in /usr/lib/nux so that is not considered
-      a conffile anymore
-  * debian/nux-tools.links:
-    - create a symlink to X11-check-unity-support in
-      /etc/X11/Xsession.d (as 50check-unity-support)
-  * debian/nux-tools.maintscript:
-    - remove /etc/X11/Xsession.d/50_check_unity_support
-      conffile on install
 
- -- Marco Trevisan (Treviño) <mail@3v1n0.net>  Wed, 13 Jun 2018 03:52:49 +0000
+ -- Marco Trevisan (Treviño) <mail@3v1n0.net>  Wed, 13 Jun 2018 12:22:05 +0000
 
 nux (4.0.8+17.10.20170922-0ubuntu1) artful; urgency=medium
 
diff -Nru nux-4.0.8+17.10.20180613.2/debian/nux-tools.install nux-4.0.8+17.10.20180613.3/debian/nux-tools.install
--- nux-4.0.8+17.10.20180613.2/debian/nux-tools.install	2018-06-13 12:24:15.000000000 +0000
+++ nux-4.0.8+17.10.20180613.3/debian/nux-tools.install	2018-06-13 12:24:15.000000000 +0000
@@ -1,3 +1,3 @@
 usr/lib/*/nux/unity_support_test usr/lib/nux
-debian/X11-check-unity-support usr/lib/nux
+debian/50_check_unity_support etc/X11/Xsession.d
 debian/source_nux.py usr/share/apport/package-hooks
diff -Nru nux-4.0.8+17.10.20180613.2/debian/nux-tools.links nux-4.0.8+17.10.20180613.3/debian/nux-tools.links
--- nux-4.0.8+17.10.20180613.2/debian/nux-tools.links	2018-06-13 12:24:15.000000000 +0000
+++ nux-4.0.8+17.10.20180613.3/debian/nux-tools.links	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/nux/X11-check-unity-support /etc/X11/Xsession.d/50check-unity-support
diff -Nru nux-4.0.8+17.10.20180613.2/debian/nux-tools.maintscript nux-4.0.8+17.10.20180613.3/debian/nux-tools.maintscript
--- nux-4.0.8+17.10.20180613.2/debian/nux-tools.maintscript	2018-06-13 12:24:15.000000000 +0000
+++ nux-4.0.8+17.10.20180613.3/debian/nux-tools.maintscript	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-rm_conffile /etc/X11/Xsession.d/50_check_unity_support
diff -Nru nux-4.0.8+17.10.20180613.2/debian/X11-check-unity-support nux-4.0.8+17.10.20180613.3/debian/X11-check-unity-support
--- nux-4.0.8+17.10.20180613.2/debian/X11-check-unity-support	2018-06-13 12:24:15.000000000 +0000
+++ nux-4.0.8+17.10.20180613.3/debian/X11-check-unity-support	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-# This file is sourced by Xsession(5), not executed.
-# If the hardware does not pass unity_support_test, fall back to LLVMpipe
-# which does.
-
-if [ "x$DESKTOP_SESSION" = "xubuntu" ] && [ -x "/usr/lib/nux/unity_support_test" ]; then
-    (
-        IFS=':'
-        for d in $XDG_CURRENT_DESKTOP; do
-            if [ "x$d" = "xUnity" ] || [ "x$d" = "xUnity7" ]; then
-                return 0
-            fi
-        done
-        return 1
-    )
-
-    if [ $? = 0 ]; then
-        /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1
-    fi
-fi
diff -Nru nux-4.0.8+17.10.20180613.2/m4/gtest.m4 nux-4.0.8+17.10.20180613.3/m4/gtest.m4
--- nux-4.0.8+17.10.20180613.2/m4/gtest.m4	2018-06-13 03:52:28.000000000 +0000
+++ nux-4.0.8+17.10.20180613.3/m4/gtest.m4	2018-06-13 12:21:46.000000000 +0000
@@ -35,8 +35,8 @@
   AC_ARG_VAR([GMOCK_CPPFLAGS],
              [C preprocessor flags for Google Mock.])
 
-  gmock_prefix=/usr/src/googletest/googlemock
-  gmock_includes=$gmock_prefix/include
+  gmock_prefix=/usr/src/gmock
+  gmock_includes=$gmock_prefix/gtest/include
   AC_ARG_WITH([gmock-prefix],[
     AS_HELP_STRING([--with-gmock-prefix],
                    [Prefix where Google Mock is installed (default $gmock_prefix)])