diff -Nru dlt-daemon-2.18.4/debian/changelog dlt-daemon-2.18.4/debian/changelog
--- dlt-daemon-2.18.4/debian/changelog	2019-09-19 11:31:17.000000000 +0000
+++ dlt-daemon-2.18.4/debian/changelog	2020-03-20 16:37:12.000000000 +0000
@@ -1,3 +1,15 @@
+dlt-daemon (2.18.4-0.2) unstable; urgency=medium
+
+  [ Martyn Welch ]
+  * Non-maintainer upload
+  * Move systemd unit files into associated packages
+    Closes: #944253
+
+  [ Gianfranco Costamagna ]
+  * Replace dbus-glib with correct libdbus-1-dev (Closes: #955836)
+
+ -- Martyn Welch <martyn.welch@collabora.com>  Fri, 20 Mar 2020 16:37:12 +0000
+
 dlt-daemon (2.18.4-0.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru dlt-daemon-2.18.4/debian/control dlt-daemon-2.18.4/debian/control
--- dlt-daemon-2.18.4/debian/control	2019-09-19 11:31:17.000000000 +0000
+++ dlt-daemon-2.18.4/debian/control	2020-03-20 16:37:12.000000000 +0000
@@ -1,7 +1,7 @@
 Source: dlt-daemon
 Priority: optional
 Maintainer: Aigars Mahinovs <aigarius@debian.org>
-Build-Depends: debhelper-compat (= 12), cmake, zlib1g-dev, libdbus-glib-1-dev, doxygen, libsystemd-dev, pandoc, systemd
+Build-Depends: debhelper-compat (= 12), cmake, zlib1g-dev, libdbus-1-dev, doxygen, libsystemd-dev, pandoc, systemd
 Standards-Version: 4.4.0
 Section: libs
 Homepage: https://at.projects.genivi.org/wiki/display/PROJ/Diagnostic+Log+and+Trace
diff -Nru dlt-daemon-2.18.4/debian/dlt-daemon.install dlt-daemon-2.18.4/debian/dlt-daemon.install
--- dlt-daemon-2.18.4/debian/dlt-daemon.install	2018-07-23 12:32:38.000000000 +0000
+++ dlt-daemon-2.18.4/debian/dlt-daemon.install	2020-03-20 16:37:12.000000000 +0000
@@ -3,6 +3,3 @@
 usr/bin/dlt-daemon
 usr/share/man/man1/dlt-daemon.*
 usr/share/man/man5/dlt.conf.*
-usr/lib/systemd/system/dlt-adaptor-udp.service /usr/share/doc/dlt-daemon/examples
-usr/lib/systemd/system/dlt-example-user.service /usr/share/doc/dlt-daemon/examples
-usr/lib/systemd/system/dlt-receive.service /usr/share/doc/dlt-daemon/examples
diff -Nru dlt-daemon-2.18.4/debian/dlt-tools.install dlt-daemon-2.18.4/debian/dlt-tools.install
--- dlt-daemon-2.18.4/debian/dlt-tools.install	2018-07-23 12:32:38.000000000 +0000
+++ dlt-daemon-2.18.4/debian/dlt-tools.install	2020-03-20 16:37:12.000000000 +0000
@@ -14,3 +14,5 @@
 usr/share/man/man1/dlt-receive*
 usr/share/man/man1/dlt-system*
 usr/share/man/man5/dlt-system*
+usr/lib/systemd/system/dlt-adaptor-udp.service /usr/share/doc/dlt-tools/examples
+usr/lib/systemd/system/dlt-receive.service /usr/share/doc/dlt-tools/examples
diff -Nru dlt-daemon-2.18.4/debian/libdlt-examples.install dlt-daemon-2.18.4/debian/libdlt-examples.install
--- dlt-daemon-2.18.4/debian/libdlt-examples.install	2018-07-23 12:32:38.000000000 +0000
+++ dlt-daemon-2.18.4/debian/libdlt-examples.install	2020-03-20 16:37:12.000000000 +0000
@@ -4,3 +4,4 @@
 src/examples/* /usr/share/doc/libdlt-examples
 doc/*.txt /usr/share/doc/libdlt-examples
 doc/images/* /usr/share/doc/libdlt-examples
+usr/lib/systemd/system/dlt-example-user.service /usr/share/doc/libdlt-examples/examples