diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs
index a7cacdc..ca15556 100644
--- a/Propellor/CmdLine.hs
+++ b/Propellor/CmdLine.hs
@@ -192,7 +192,7 @@ spin host = do
 	bootstrapcmd = shellWrap $ intercalate " ; "
 		[ "if [ ! -d " ++ localdir ++ " ]"
 		, "then " ++ intercalate " && "
-			[ "apt-get -y install git"
+			[ "apt-get -y install git make"
 			, "echo " ++ toMarked statusMarker (show NeedGitClone)
 			]
 		, "else " ++ intercalate " && "
diff --git a/config-joey.hs b/config-joey.hs
index 069ea39..dfa56e5 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -59,10 +59,11 @@ host hostname@"diatom.kitenet.net" = Just $ props
 	& standardSystem Stable
 	& Hostname.set hostname
 	& Apt.unattendedUpgrades
-	& Apt.serviceInstalledRunning "apache2"
-	& Apt.serviceInstalledRunning "bind9"
 	& Apt.serviceInstalledRunning "ntp"
-	& Apt.installed ["git", "git-annex"]
+	& Apt.serviceInstalledRunning "bind9"
+	& Apt.serviceInstalledRunning "apache2"
+	& Apt.serviceInstalledRunning "git-daemon-sysvinit"
+	& Apt.installed ["git", "git-annex", "rsync"]
 	& Apt.buildDep ["git-annex"] `period` Daily
 -- My laptop
 host _hostname@"darkstar.kitenet.net" = Just $ props