diff --git a/.ci/install-deps.sh b/.ci/install-deps.sh
index d53f1d18..99e67adc 100755
--- a/.ci/install-deps.sh
+++ b/.ci/install-deps.sh
@@ -36,10 +36,7 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
     libdb-dev \
     systemd-services \
     systemd \
-    libsystemd-journal-dev \
-    libsystemd-login-dev \
-    libsystemd-id128-dev \
-    libsystemd-daemon-dev \
+    libsystemd-dev \
     libpam-systemd \
     libdbus-1-dev \
     libeigen3-dev \
diff --git a/.travis.yml b/.travis.yml
index f7d12e7e..dd5e74a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
             - ubuntu-toolchain-r-test
           install:
             - gcc-8
-      dist: trusty
+      dist: xenial
       env:
         - MATRIX_EVAL="CC=gcc-8 CXX=g++-8"
       compiler: gcc
@@ -24,7 +24,7 @@ matrix:
             - ubuntu-toolchain-r-test
           install:
             - gcc-7
-      dist: trusty
+      dist: xenial
       env:
         - MATRIX_EVAL="CC=gcc-7 CXX=g++-7"
       compiler: gcc
@@ -36,17 +36,17 @@ matrix:
             - ubuntu-toolchain-r-test
           install:
             - gcc-6
-      dist: trusty
+      dist: xenial
       env:
         - MATRIX_EVAL="CC=gcc-6 CXX=g++-6"
       compiler: gcc
     # linux with gcc default (4.8)
     - os: linux
-      dist: trusty
+      dist: xenial
       compiler: gcc
     # linux with clang default (3.5)
     - os: linux
-      dist: trusty
+      dist: xenial
       compiler: clang
     # linux with clang 3.8
     - os: linux
@@ -56,7 +56,7 @@ matrix:
             - ubuntu-toolchain-r-test
           install:
             - clang-3.8
-      dist: trusty
+      dist: xenial
       env:
         - MATRIX_EVAL="CC=clang-3.8 CXX=clang++-3.8"
       compiler: clang
diff --git a/systemd/example.conf b/systemd/example.conf
index dbd8026d..2905d586 100644
--- a/systemd/example.conf
+++ b/systemd/example.conf
@@ -1,14 +1,19 @@
 # Configuration profile for the templated systemd user unit jack@.service
 # A (modified) copy of this configuration can be used to start jackd staticly
 # for a user, which has the upside, that other systemd user units can depend on
-# it. 
+# it.
 #
 # The systemd user service expects the configuration profiles to be located
 # below /etc/jack or the user's $XDG_CONFIG_HOME and can then be started using
-# ssystemctl (i.e.  `systemctl --user start jack@example`).
+# systemctl (i.e. `systemctl --user start jack@example`).
 #
-# For further details regarding the various options and drivers, see `man 1
-# jackd`.
+# Please note, that setups can be very diverse and therefore this approach
+# might or might not suit your requirements. However, it attempts to be as
+# versatile as possible.
+#
+# For further details regarding the various options and drivers used by JACK,
+# see `man 1 jackd` and for information on systemd's unit configuration see
+# `man 5 systemd.unit`, `man 5 systemd.service` and `man 5 systemd.exec`.
 #
 
 # The name of the JACK server
diff --git a/systemd/wscript b/systemd/wscript
index 00e820d1..1d4563ea 100644
--- a/systemd/wscript
+++ b/systemd/wscript
@@ -14,8 +14,8 @@ def set_systemd_user_unit_dir(conf):
     if not systemd_user_unit_dir:
         conf.env['SYSTEMD_USER_UNIT_DIR'] = None
     else:
-        systemd_user_unit_dir.strip()
-        conf.env['SYSTEMD_USER_UNIT_DIR'] = systemd_user_unit_dir
+        conf.env['SYSTEMD_USER_UNIT_DIR'] = \
+                systemd_user_unit_dir.replace("\n", "")
 
 
 def configure(conf):