diff --git a/systemd/ndncert-server.service.in b/systemd/ndncert-server.service.in
index 443fc44..7ebecfa 100644
--- a/systemd/ndncert-server.service.in
+++ b/systemd/ndncert-server.service.in
@@ -12,25 +12,6 @@
 RestartPreventExitStatus=2
 User=ndncert
 
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-NoNewPrivileges=yes
-PrivateDevices=yes
-PrivateTmp=yes
-PrivateUsers=yes
-ProtectControlGroups=yes
-ProtectHome=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-ProtectSystem=full
-RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
-RestrictNamespaces=yes
-RestrictRealtime=yes
-StateDirectory=ndn/ndncert
-SystemCallArchitectures=native
-SystemCallErrorNumber=EPERM
-SystemCallFilter=~@clock @cpu-emulation @debug @module @mount @obsolete @privileged @raw-io @reboot @setuid @swap
-
 [Install]
 WantedBy=multi-user.target
 Alias=ndncert.service
diff --git a/wscript b/wscript
index b4641f2..217adbf 100644
--- a/wscript
+++ b/wscript
@@ -16,6 +16,8 @@
     optgrp = opt.add_option_group('ndncert Options')
     optgrp.add_option('--with-tests', action='store_true', default=False,
                       help='Build unit tests')
+    optgrp.add_option('--without-systemd', action='store_true', default=False,
+                      help='Disable systemd integration')
 
 def configure(conf):
     conf.load(['compiler_cxx', 'gnu_dirs',
@@ -26,6 +28,10 @@
     conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'], uselib_store='NDN_CXX',
                    pkg_config_path=os.environ.get('PKG_CONFIG_PATH', '%s/pkgconfig' % conf.env.LIBDIR))
 
+    if not conf.options.without_systemd:
+            conf.check_cfg(package='libsystemd', args=['--cflags', '--libs'],
+                           uselib_store='SYSTEMD', mandatory=False)
+
     conf.check_sqlite3()
     conf.check_openssl(lib='crypto', atleast_version=0x1010100f) # 1.1.1
 
@@ -98,8 +104,7 @@
         target='bin/ndncert-send-email-challenge',
         install_path='${BINDIR}',
         chmod=Utils.O755)
-
-    if Utils.unversioned_sys_platform() == 'linux':
+     if bld.env.HAVE_SYSTEMD:
         bld(features='subst',
             name='ndncert-server.service',
             source='systemd/ndncert-server.service.in',