diff --git a/wscript b/wscript
index 2879df5..dbf25a1 100644
--- a/wscript
+++ b/wscript
@@ -14,7 +14,7 @@
              tooldir=['.waf-tools'])
 
     opt.add_option('--with-tests', action='store_true', default=False,
-                   dest='with_tests', help='''Build unit tests''')
+                   help='Build unit tests')
 
     opt.recurse('tools')
 
@@ -48,9 +48,9 @@
     version(bld)
 
     bld(features='subst',
+        name='version.cpp',
         source='core/version.cpp.in',
         target='core/version.cpp',
-        name='version.cpp',
         VERSION_BUILD=VERSION)
 
     bld.objects(target='core-objects',
@@ -59,6 +59,13 @@
                 includes='.',
                 export_includes='.')
 
+    if Utils.unversioned_sys_platform() == 'linux':
+        systemd_units = bld.path.ant_glob('systemd/*.in')
+        bld(features='subst',
+            name='systemd-units',
+            source=systemd_units,
+            target=[u.change_ext('') for u in systemd_units])
+
     bld.recurse('tools')
     bld.recurse('tests')
     bld.recurse('manpages')