diff --git a/debian/freeswitch-systemd.freeswitch.conf b/debian/freeswitch-systemd.freeswitch.conf
deleted file mode 100644
index 77dfd6908c..0000000000
--- a/debian/freeswitch-systemd.freeswitch.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/freeswitch 0755  freeswitch freeswitch -
diff --git a/debian/freeswitch-systemd.freeswitch.service b/debian/freeswitch-systemd.freeswitch.service
index 3ddae52112..ac24c49a3e 100644
--- a/debian/freeswitch-systemd.freeswitch.service
+++ b/debian/freeswitch-systemd.freeswitch.service
@@ -9,13 +9,13 @@ After=syslog.target network.target local-fs.target
 Type=forking
 PIDFile=/run/freeswitch/freeswitch.pid
 PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /run/freeswitch
-ExecStartPre=/bin/chown freeswitch:freeswitch /run/freeswitch
 ExecStartPre=/bin/chown freeswitch:freeswitch /etc/freeswitch/tls
 ExecStart=/usr/bin/freeswitch -ncwait -nonat
 TimeoutSec=45s
 Restart=always
 ; exec
+RuntimeDirectory=freeswitch
+RuntimeDirectoryMode=0755
 WorkingDirectory=/var/log/freeswitch
 User=freeswitch
 Group=freeswitch
diff --git a/debian/freeswitch-systemd.install b/debian/freeswitch-systemd.install
index b554d1b2bd..d647282ecd 100644
--- a/debian/freeswitch-systemd.install
+++ b/debian/freeswitch-systemd.install
@@ -1,2 +1 @@
 /lib/systemd/system/freeswitch.service
-/usr/lib/tmpfiles.d/freeswitch.conf
diff --git a/debian/rules b/debian/rules
index 07437f271a..b2e43d68d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,10 +100,6 @@ override_dh_auto_install:
 	dh_auto_install -- -C libs/esl pymod-install
 	mkdir -p debian/tmp/lib/systemd/system
 	install -m0644 debian/freeswitch-systemd.freeswitch.service debian/tmp/lib/systemd/system/freeswitch.service
-
-	mkdir -p debian/tmp/usr/lib/tmpfiles.d
-	install -m0644 debian/freeswitch-systemd.freeswitch.conf debian/tmp/usr/lib/tmpfiles.d/freeswitch.conf
-
 	rm -f debian/tmp/usr/share/freeswitch/grammar/model/communicator/COPYING
 
 override_dh_installinit: