diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index cffa761..1688bca 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -217,7 +217,7 @@ sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor
   where
 	go tmpdir = do
 		cacheparams <- sshCachingParams hn
-		let shimdir = takeFileName localdir
+		let shimdir = takeFileName localdir </> "shim"
 		createDirectoryIfMissing True (tmpdir </> shimdir)
 		changeWorkingDirectory (tmpdir </> shimdir)
 		me <- readSymbolicLink "/proc/self/exe"
@@ -237,9 +237,10 @@ sendPrecompiled hn = void $ actionMessage ("Uploading locally compiled propellor
 
 	unpackcmd = shellWrap $ intercalate " && "
 		[ "cd " ++ takeDirectory remotetarball
-		, "rm -rf " ++ localdir
+		, "rm -rf " ++ localdir </> "shim"
 		, "tar xzf " ++ remotetarball
 		, "rm -f " ++ remotetarball
+		, "ln -sf shim/propellor propellor/propellor"
 		]
 
 -- Shim for git push over the propellor ssh channel.