diff --git a/Makefile b/Makefile
index a0d4e0334..403759fd9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PKGNAME = entropy
 PYTHON = python2
 SUBDIRS = client conf docs entropy-notification-applet handlers libraries misc/po misc server spritz
-SERVER_INSPKGS = reagent.py activator.py server_reagent.py server_activator.py repository-admin-daemon repository-services-daemon server_query.py
+SERVER_INSPKGS = reagent.py activator.py server_reagent.py server_activator.py repository-admin-daemon repository-services-daemon.example server_query.py
 
 all:
 	for d in $(SUBDIRS); do make -C $$d; done
@@ -22,9 +22,10 @@ entropy-install:
 	mkdir -p $(DESTDIR)/etc/init.d
 	cp libraries $(DESTDIR)/$(LIBDIR)/entropy/ -Ra
 	install -m 755 services/repository-admin-daemon $(DESTDIR)/usr/sbin/
-	install -m 755 services/repository-services-daemon $(DESTDIR)/usr/sbin/
+	install -m 755 services/repository-services-daemon.example $(DESTDIR)/usr/sbin/
 	install -m 755 misc/entropy.sh $(DESTDIR)/usr/sbin/
 	install -m 755 services/repository_admin $(DESTDIR)/etc/init.d/
+	install -m 755 services/repository_services $(DESTDIR)/etc/init.d/
 
 	install -m 644 conf/entropy.conf $(DESTDIR)/etc/entropy/
 	install -m 644 conf/fsdirs.conf $(DESTDIR)/etc/entropy/
diff --git a/services/repository-services-daemon b/services/repository-services-daemon.example
similarity index 100%
rename from services/repository-services-daemon
rename to services/repository-services-daemon.example
diff --git a/services/repository_admin b/services/repository_admin
index d4b5add3d..8a397b7ab 100755
--- a/services/repository_admin
+++ b/services/repository_admin
@@ -2,8 +2,8 @@
 # Copyright 2009 Fabio Erculiani
 # Distributed under the terms of the GNU General Public License v2
 
-DAEMON_EXEC="/usr/sbin/entropy-system-daemon"
-PID="/var/run/entropy_system_daemon.pid"
+DAEMON_EXEC="/usr/sbin/repository-admin-daemon"
+PID="/var/run/entropy_repo_admin.pid"
 CMDLINE="--nostdout"
 
 depend() {
diff --git a/services/repository_services b/services/repository_services
new file mode 100755
index 000000000..47de98b85
--- /dev/null
+++ b/services/repository_services
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 2009 Fabio Erculiani
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON_EXEC="/usr/sbin/repository-services-daemon"
+PID="/var/run/entropy_repo_services.pid"
+CMDLINE="--nostdout"
+
+depend() {
+    use dns net localmount netmount nfsmount hostname
+}
+
+start() {
+
+    if [ -x "${DAEMON_EXEC}" ]; then
+        ebegin "Starting Entropy repository services daemon"
+        start-stop-daemon --background --make-pidfile --start --pidfile ${PID} --quiet --exec ${DAEMON} -- ${CMDLINE}
+        sleep 3
+        if [ -f "${PID}" ]; then
+            if [ -d "/proc/$(cat ${PID})" ]; then
+                eend 0
+            else
+                eend 1
+            fi
+        else
+            eend 1
+        fi
+    else
+        eerror "Entropy repository services daemon load error"
+        eerror "You need to copy and setup ${DAEMON_EXEC}.example to ${DAEMON_EXEC}"
+        eend 1
+    fi
+
+}
+
+stop() {
+
+    ebegin "Stopping Entropy repository services daemon"
+    if [ -f "${PID}" ]; then
+        mypid=$(cat $PID 2&> /dev/null)
+        if [ -d "/proc/$(cat ${mypid})" ]; then
+            eend 0
+        else
+            eend 1
+        fi
+    else
+        eend 1
+    fi
+
+}