diff --git a/Config/Files.hs b/Config/Files.hs
index 357481ca67..e51e8a747e 100644
--- a/Config/Files.hs
+++ b/Config/Files.hs
@@ -54,4 +54,7 @@ programFile = userConfigFile "program"
 readProgramFile :: IO FilePath
 readProgramFile = do
 	programfile <- programFile
-	catchDefaultIO "git-annex" $ readFile programfile
+	catchDefaultIO cmd $ 
+		fromMaybe cmd . headMaybe . lines <$> readFile programfile
+  where
+  	cmd = "git-annex"