diff -Nru conmux-0.12.0/debian/changelog conmux-0.12.0/debian/changelog
--- conmux-0.12.0/debian/changelog	2014-06-23 13:25:15.000000000 +0000
+++ conmux-0.12.0/debian/changelog	2015-01-15 16:24:41.000000000 +0000
@@ -1,3 +1,24 @@
+conmux (0.12.0-1ubuntu2) vivid; urgency=medium
+
+  * debian/conmux-daemon-generator: add $1 for the systemd generator path
+    instead of harcoding.
+
+ -- Didier Roche <didrocks@ubuntu.com>  Thu, 15 Jan 2015 17:23:36 +0100
+
+conmux (0.12.0-1ubuntu1) vivid; urgency=medium
+
+  * Add systemd units in addition to the existing upstart one. Note that
+    all logs are redirected to the journal (syslog if installed) instead
+    of individual logs. You can use
+    journalctl -u conmux-daemon@<config_filename> to get individual daemon
+    logs.
+  * Add debian/conmux-daemon-generator to generate dynamic systemd instances
+    based on /etc/conmux/*.cf.
+  * Bump Standards-Version.
+  * Removing HomePage: no homepage anymore for this project.
+
+ -- Didier Roche <didrocks@ubuntu.com>  Thu, 15 Jan 2015 14:30:41 +0100
+
 conmux (0.12.0-1) unstable; urgency=medium
 
   * Upload 0.12.0-0ubuntu3 to unstable.
diff -Nru conmux-0.12.0/debian/conmux-daemon-generator conmux-0.12.0/debian/conmux-daemon-generator
--- conmux-0.12.0/debian/conmux-daemon-generator	1970-01-01 00:00:00.000000000 +0000
+++ conmux-0.12.0/debian/conmux-daemon-generator	2015-01-15 16:23:01.000000000 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+GENERATORPATH=$1/conmux.service.d
+
+# Generate conmux-daemon instances hooked up in conmux service
+for f in /etc/conmux/*.cf; do
+    # if no file, we will get f=/etc/conmux/*.cf
+    [ ! -f "$f" ] && continue
+    configname=`basename "$f"`
+
+	[ ! -d "$GENERATORPATH" ] && mkdir -p "$GENERATORPATH"
+    echo "# Automatically generated by conmux-daemon-generator
+[Unit]
+Wants=conmux-daemon@${configname}.service" > "$GENERATORPATH"/conmux-daemon-$configname.conf
+done
diff -Nru conmux-0.12.0/debian/conmux-daemon@.service conmux-0.12.0/debian/conmux-daemon@.service
--- conmux-0.12.0/debian/conmux-daemon@.service	1970-01-01 00:00:00.000000000 +0000
+++ conmux-0.12.0/debian/conmux-daemon@.service	2015-01-15 15:35:40.000000000 +0000
@@ -0,0 +1,9 @@
+[Unit]
+Description=CONMUX daemon for /etc/conmux/%I
+Requires=conmux.service
+After=conmux.service
+ConditionFileNotEmpty=/etc/conmux/%I
+
+[Service]
+ExecStart=/usr/sbin/conmux /etc/conmux/%I
+Restart=on-failure
diff -Nru conmux-0.12.0/debian/conmux.install conmux-0.12.0/debian/conmux.install
--- conmux-0.12.0/debian/conmux.install	2011-03-02 19:00:47.000000000 +0000
+++ conmux-0.12.0/debian/conmux.install	2015-01-15 14:49:51.000000000 +0000
@@ -3,3 +3,4 @@
 conmux/lib/helpers              usr/share/conmux
 conmux/sbin                     usr
 usr/share/perl*/Conmux.pm
+debian/conmux-daemon-generator  lib/systemd/system-generators/
diff -Nru conmux-0.12.0/debian/conmux.service conmux-0.12.0/debian/conmux.service
--- conmux-0.12.0/debian/conmux.service	1970-01-01 00:00:00.000000000 +0000
+++ conmux-0.12.0/debian/conmux.service	2015-01-15 14:43:00.000000000 +0000
@@ -0,0 +1,9 @@
+[Unit]
+Description=CONMUX registry
+
+[Service]
+ExecStart=/bin/sh -ec "touch /var/run/conmux-registry && exec /usr/sbin/conmux-registry 63000 /var/run/conmux-registry"
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff -Nru conmux-0.12.0/debian/control conmux-0.12.0/debian/control
--- conmux-0.12.0/debian/control	2014-06-23 13:23:54.000000000 +0000
+++ conmux-0.12.0/debian/control	2015-01-15 13:55:04.000000000 +0000
@@ -1,10 +1,10 @@
 Source: conmux
-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Section: net
 Priority: optional
-Standards-Version: 3.9.5
-Homepage: http://autotest.kernel.org/wiki/Conmux
-Build-Depends: debhelper (>= 8~)
+Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 8~), dh-systemd
 
 Package: conmux
 Architecture: all
diff -Nru conmux-0.12.0/debian/rules conmux-0.12.0/debian/rules
--- conmux-0.12.0/debian/rules	2011-03-02 19:00:47.000000000 +0000
+++ conmux-0.12.0/debian/rules	2015-01-15 14:52:05.000000000 +0000
@@ -17,6 +17,7 @@
 override_dh_installinit:
 	dh_installinit
 	dh_installinit -n --name=conmux-daemon
+	dh_installinit -n --name=conmux-daemon@
 
 %:
-	dh $@
+	dh $@ --with systemd