diff --git a/Makefile b/Makefile
index 0904db07..4b253c36 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
 
 DESTDIR=
 
-SUBDIRS = aplinfo PVE bin www
+SUBDIRS = aplinfo PVE bin www services
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell git rev-parse HEAD)
diff --git a/bin/Makefile b/bin/Makefile
index 8d141810..f599e2d1 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -6,7 +6,7 @@ include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
 export PERLLIB=..
 
-SUBDIRS = init.d test
+SUBDIRS = test
 
 SERVICES = pvestatd pveproxy pvedaemon spiceproxy
 CLITOOLS = vzdump pvesubscription pveceph pveam pvesr pvenode
diff --git a/bin/init.d/Makefile b/services/Makefile
similarity index 97%
rename from bin/init.d/Makefile
rename to services/Makefile
index f0fc7f9c..a68126e8 100644
--- a/bin/init.d/Makefile
+++ b/services/Makefile
@@ -1,4 +1,4 @@
-include ../../defines.mk
+include ../defines.mk
 
 all:
 
diff --git a/bin/init.d/ceph-after-pve-cluster.conf b/services/ceph-after-pve-cluster.conf
similarity index 100%
rename from bin/init.d/ceph-after-pve-cluster.conf
rename to services/ceph-after-pve-cluster.conf
diff --git a/bin/init.d/ceph.service b/services/ceph.service
similarity index 100%
rename from bin/init.d/ceph.service
rename to services/ceph.service
diff --git a/bin/init.d/pve-daily-update.service b/services/pve-daily-update.service
similarity index 100%
rename from bin/init.d/pve-daily-update.service
rename to services/pve-daily-update.service
diff --git a/bin/init.d/pve-daily-update.timer b/services/pve-daily-update.timer
similarity index 100%
rename from bin/init.d/pve-daily-update.timer
rename to services/pve-daily-update.timer
diff --git a/bin/init.d/pve-guests.service b/services/pve-guests.service
similarity index 100%
rename from bin/init.d/pve-guests.service
rename to services/pve-guests.service
diff --git a/bin/init.d/pve-storage.target b/services/pve-storage.target
similarity index 100%
rename from bin/init.d/pve-storage.target
rename to services/pve-storage.target
diff --git a/bin/init.d/pvebanner.service b/services/pvebanner.service
similarity index 100%
rename from bin/init.d/pvebanner.service
rename to services/pvebanner.service
diff --git a/bin/init.d/pvedaemon.service b/services/pvedaemon.service
similarity index 100%
rename from bin/init.d/pvedaemon.service
rename to services/pvedaemon.service
diff --git a/bin/init.d/pvenetcommit b/services/pvenetcommit
similarity index 100%
rename from bin/init.d/pvenetcommit
rename to services/pvenetcommit
diff --git a/bin/init.d/pvenetcommit.service b/services/pvenetcommit.service
similarity index 100%
rename from bin/init.d/pvenetcommit.service
rename to services/pvenetcommit.service
diff --git a/bin/init.d/pveproxy.service b/services/pveproxy.service
similarity index 100%
rename from bin/init.d/pveproxy.service
rename to services/pveproxy.service
diff --git a/bin/init.d/pvesr.service b/services/pvesr.service
similarity index 100%
rename from bin/init.d/pvesr.service
rename to services/pvesr.service
diff --git a/bin/init.d/pvesr.timer b/services/pvesr.timer
similarity index 100%
rename from bin/init.d/pvesr.timer
rename to services/pvesr.timer
diff --git a/bin/init.d/pvestatd.service b/services/pvestatd.service
similarity index 100%
rename from bin/init.d/pvestatd.service
rename to services/pvestatd.service
diff --git a/bin/init.d/spiceproxy.service b/services/spiceproxy.service
similarity index 100%
rename from bin/init.d/spiceproxy.service
rename to services/spiceproxy.service