diff --git a/debian/metaproxy.default b/debian/metaproxy.default
deleted file mode 100644
index 550fe05..0000000
--- a/debian/metaproxy.default
+++ /dev/null
@@ -1,8 +0,0 @@
-# Metaproxy user information
-SERVER_HOME=/var/lib/metaproxy
-SERVER_USER=metaproxy
-SERVER_NAME="Metaproxy user"
-SERVER_GROUP=metaproxy
-# Options passed in metaproxy.service
-# Do *not* use -D unless changing Type=fork
-OPTIONS="-u ${SERVER_USER} -l /var/log/metaproxy.log -c /etc/metaproxy/metaproxy.xml"
diff --git a/debian/metaproxy.install b/debian/metaproxy.install
index 1c2f17e..7e8e843 100644
--- a/debian/metaproxy.install
+++ b/debian/metaproxy.install
@@ -1,4 +1,6 @@
 etc/metaproxy/metaproxy.xml
+etc/metaproxy/metaproxy.user
+etc/default/metaproxy
 usr/bin/metaproxy
 usr/share/man/man1/metaproxy.1
 usr/share/man/man3/*
diff --git a/debian/metaproxy.postinst b/debian/metaproxy.postinst
index deefd1c..3b7772f 100644
--- a/debian/metaproxy.postinst
+++ b/debian/metaproxy.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
     configure)
-    . /etc/default/metaproxy
+    . /etc/metaproxy/metaproxy.user
 
     # remove old init.d script if existing
     if [ -f /etc/init.d/metaproxy ]; then
diff --git a/debian/metaproxy.service b/debian/metaproxy.service
index d41ae7e..55f782c 100644
--- a/debian/metaproxy.service
+++ b/debian/metaproxy.service
@@ -7,6 +7,7 @@ After=network.target
 
 [Service]
 Type=exec
+EnvironmentFile=/etc/metaproxy/metaproxy.user
 EnvironmentFile=/etc/default/metaproxy
 Restart=on-abort
 KillMode=process
diff --git a/debian/rules b/debian/rules
index b75b788..0219650 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,9 @@ override_dh_auto_install:
 	mv debian/tmp/usr/share/doc/metaproxy debian/tmp/usr/share/doc/metaproxy-doc
 	mkdir -p debian/tmp/etc/metaproxy
 	cp debian/metaproxy.xml debian/tmp/etc/metaproxy/metaproxy.xml
+	cp rpm/metaproxy.user debian/tmp/etc/metaproxy/metaproxy.user
+	mkdir -p debian/tmp/etc/default
+	cp rpm/metaproxy.sysconfig debian/tmp/etc/default/metaproxy
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V 'libmetaproxy6 (>= 1.12.0)'
diff --git a/rpm/metaproxy.sysconfig b/rpm/metaproxy.sysconfig
index 9c7f621..a59462d 100644
--- a/rpm/metaproxy.sysconfig
+++ b/rpm/metaproxy.sysconfig
@@ -1,4 +1,4 @@
 # Defaults for metaproxy
-OPTIONS="-u $SERVER_USER -l /var/log/metaproxy.log -c /etc/metaproxy/metaproxy.xml"
-# The following options should not be set, because init.d script 
-# already sets them: -p, -D, -t
+# SERVER_USER is defined in /etc/metaproxy/metaproxy.user
+# Options used for starting metaproxy in metaproxy.service
+OPTIONS="-u ${SERVER_USER} -l /var/log/metaproxy.log -c /etc/metaproxy/metaproxy.xml"