diff --git a/build/make/automysqlbackup.mk b/build/make/automysqlbackup.mk
index 1802f59..238f504 100644
--- a/build/make/automysqlbackup.mk
+++ b/build/make/automysqlbackup.mk
@@ -1,3 +1,3 @@
-automysqlbackup:
+automysqlbackup: base
 	$(call script,$@)
 	$(call boot,02,$@)
\ No newline at end of file
diff --git a/build/make/backintime.mk b/build/make/backintime.mk
index 1e3651a..4046f3a 100644
--- a/build/make/backintime.mk
+++ b/build/make/backintime.mk
@@ -1,2 +1,2 @@
-backintime: cron
+backintime: base sshd cron
 	$(call script,$@)
diff --git a/build/make/base.mk b/build/make/base.mk
index 6d2a8c5..144766a 100644
--- a/build/make/base.mk
+++ b/build/make/base.mk
@@ -1,3 +1,6 @@
-base: cron sshd
+base:
+	$(call add,init,/opt/init)
+	@echo 'RUN chmod +x /opt/init' >> ${FILE}
+	@echo 'CMD ["/opt/init"]' >> ${FILE}
 	$(call script,utilities)
 	$(call script,runit)
\ No newline at end of file
diff --git a/build/make/btsync.mk b/build/make/btsync.mk
index acf7973..5894d83 100644
--- a/build/make/btsync.mk
+++ b/build/make/btsync.mk
@@ -1,4 +1,4 @@
-btsync:
+btsync: base
 	$(call script,$@)
 	$(call runit,$@)
 	$(call boot,02,$@)
\ No newline at end of file
diff --git a/build/make/collectd.mk b/build/make/collectd.mk
index 72c7ff3..5b7527f 100644
--- a/build/make/collectd.mk
+++ b/build/make/collectd.mk
@@ -1,3 +1,3 @@
-collectd:
+collectd: base
 	$(call script,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/couchpotato.mk b/build/make/couchpotato.mk
index b92687a..f1d31db 100644
--- a/build/make/couchpotato.mk
+++ b/build/make/couchpotato.mk
@@ -1,4 +1,4 @@
-couchpotato:
+couchpotato: base
 	$(call script,$@)
 	$(call boot,02,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/ftpd.mk b/build/make/ftpd.mk
new file mode 100644
index 0000000..028f009
--- /dev/null
+++ b/build/make/ftpd.mk
@@ -0,0 +1,2 @@
+ftpd: base
+	$(call script,$@)
\ No newline at end of file
diff --git a/build/make/gmrender.mk b/build/make/gmrender.mk
index 182d1a7..a9c0c09 100644
--- a/build/make/gmrender.mk
+++ b/build/make/gmrender.mk
@@ -1,3 +1,3 @@
-gmrender: compile
+gmrender: base compile
 	$(call script,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/hamachi.mk b/build/make/hamachi.mk
index 4b1dab5..aadc581 100644
--- a/build/make/hamachi.mk
+++ b/build/make/hamachi.mk
@@ -1,4 +1,4 @@
-hamachi:
+hamachi: base
 	$(call script,$@)
 	$(call runit,$@)
     $(call boot,02,$@)
\ No newline at end of file
diff --git a/build/make/headphones.mk b/build/make/headphones.mk
index 8f41b7e..59e000a 100644
--- a/build/make/headphones.mk
+++ b/build/make/headphones.mk
@@ -1,4 +1,4 @@
-headphones: encoders
+headphones: base encoders
 	$(call script,ffmpeg)
 	$(call script,$@)
 	$(call boot,02,$@)
diff --git a/build/make/jekyll.mk b/build/make/jekyll.mk
new file mode 100644
index 0000000..86f7421
--- /dev/null
+++ b/build/make/jekyll.mk
@@ -0,0 +1,5 @@
+jekyll:
+	sed -i "s,\(FROM\s*\).*,\1grahamc/jekyll:latest\nUSER root," ${FILE}
+	$(call file,Gemfile)
+	echo 'RUN bundler' >> ${FILE}
+	echo 'ENTRYPOINT ["jekyll"]' >> ${FILE}
\ No newline at end of file
diff --git a/build/make/jenkins.mk b/build/make/jenkins.mk
new file mode 100644
index 0000000..4d33887
--- /dev/null
+++ b/build/make/jenkins.mk
@@ -0,0 +1,4 @@
+jenkins:
+	sed -i "s,\(FROM\s*\).*,\1jenkins:2.0\nUSER root," ${FILE}    
+	echo 'ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]' >> ${FILE}    
+	$(call script,$@)
\ No newline at end of file
diff --git a/build/make/kodi.mk b/build/make/kodi.mk
index b93564d..7be27e5 100644
--- a/build/make/kodi.mk
+++ b/build/make/kodi.mk
@@ -1,4 +1,4 @@
-kodi: encoders
-	$(call add,aux/headless.patch,/headless.patch)
+kodi: base encoders
+	$(call file,headless.patch)
 	$(call script,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/lighttpd.mk b/build/make/lighttpd.mk
index fe3465a..010ea5c 100644
--- a/build/make/lighttpd.mk
+++ b/build/make/lighttpd.mk
@@ -1,3 +1,3 @@
-lighttpd: compile
+lighttpd: base compile
 	$(call script,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/minidlna.mk b/build/make/minidlna.mk
index f9e9c71..3b20b1d 100644
--- a/build/make/minidlna.mk
+++ b/build/make/minidlna.mk
@@ -1,3 +1,3 @@
-minidlna: compile
+minidlna: base compile
 	$(call script,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/mpd.mk b/build/make/mpd.mk
new file mode 100644
index 0000000..25044a5
--- /dev/null
+++ b/build/make/mpd.mk
@@ -0,0 +1,2 @@
+mpd: pulseaudio mpd
+	$(call script,$@)
\ No newline at end of file
diff --git a/build/make/mysql.mk b/build/make/mysql.mk
index 451a786..afa2d4f 100644
--- a/build/make/mysql.mk
+++ b/build/make/mysql.mk
@@ -1,3 +1,3 @@
-mysql:
+mysql: base
 	$(call script,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/phpmyadmin.mk b/build/make/phpmyadmin.mk
index 8d48e17..3ed5586 100644
--- a/build/make/phpmyadmin.mk
+++ b/build/make/phpmyadmin.mk
@@ -1,3 +1,3 @@
-phpmyadmin: 
+phpmyadmin: base
 	$(call script,$@)
-	$(call boot,02,$@)
+	$(call boot,02,$@)
\ No newline at end of file
diff --git a/build/make/redis.mk b/build/make/redis.mk
index b4be393..4f3730b 100644
--- a/build/make/redis.mk
+++ b/build/make/redis.mk
@@ -1,3 +1,3 @@
-redis:
+redis: base
 	$(call script,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/sabnzbd.mk b/build/make/sabnzbd.mk
index 725611b..03114e8 100644
--- a/build/make/sabnzbd.mk
+++ b/build/make/sabnzbd.mk
@@ -1,4 +1,4 @@
-sabnzbd:
+sabnzbd: base
 	$(call script,$@)
 	$(call boot,02,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/sickbeard.mk b/build/make/sickbeard.mk
index 88a19a1..3d3e5e3 100644
--- a/build/make/sickbeard.mk
+++ b/build/make/sickbeard.mk
@@ -1,4 +1,4 @@
-sickbeard: subliminal
+sickbeard: base subliminal
 	$(call script,$@)
 	$(call boot,02,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/sonarr.mk b/build/make/sonarr.mk
index b620064..8c8b75d 100644
--- a/build/make/sonarr.mk
+++ b/build/make/sonarr.mk
@@ -1,3 +1,3 @@
-sonarr:
+sonarr: base
 	$(call script,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/sshd.mk b/build/make/sshd.mk
index 4c137e3..e0038fc 100644
--- a/build/make/sshd.mk
+++ b/build/make/sshd.mk
@@ -1,3 +1,3 @@
-sshd:
+sshd: base
 	$(call script,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/syncthing.mk b/build/make/syncthing.mk
index 674fe8f..7c24b20 100644
--- a/build/make/syncthing.mk
+++ b/build/make/syncthing.mk
@@ -1,4 +1,4 @@
-syncthing:
+syncthing: base
 	$(call script,$@)
 	$(call runit,$@)
 	$(call boot,02,$@)
diff --git a/build/make/transmission.mk b/build/make/transmission.mk
index 1c7c5cb..faab677 100644
--- a/build/make/transmission.mk
+++ b/build/make/transmission.mk
@@ -1,4 +1,4 @@
-transmission:
+transmission: base
 	$(call script,$@)
 	$(call boot,02,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/upnpproxy.mk b/build/make/upnpproxy.mk
index 51e3d12..d8ebea4 100644
--- a/build/make/upnpproxy.mk
+++ b/build/make/upnpproxy.mk
@@ -1,3 +1,3 @@
-upnpproxy: compile
+upnpproxy: base compile
 	$(call script,$@)
 	$(call runit,$@)
\ No newline at end of file
diff --git a/build/make/webserver.mk b/build/make/webserver.mk
index c02ca1a..937c5e1 100644
--- a/build/make/webserver.mk
+++ b/build/make/webserver.mk
@@ -1,3 +1,3 @@
-webserver: lighttpd-php phpmyadmin
+webserver: base lighttpd-php phpmyadmin
 	$(call script,$@)
 	$(call boot,02,$@)
\ No newline at end of file