diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs
index 9a50778d4e..7ce3900c19 100644
--- a/Build/BundledPrograms.hs
+++ b/Build/BundledPrograms.hs
@@ -35,6 +35,7 @@ bundledPrograms = catMaybes
 	, ifset SysConfig.wget "wget"
 	, ifset SysConfig.bup "bup"
 	, SysConfig.lsof
+	, SysConfig.gcrypt
 	, SysConfig.sha1
 	, SysConfig.sha256
 	, SysConfig.sha512
diff --git a/Build/Configure.hs b/Build/Configure.hs
index 31fbbf1dd7..9caff6c089 100644
--- a/Build/Configure.hs
+++ b/Build/Configure.hs
@@ -38,6 +38,7 @@ tests =
 		[ ("gpg", "--version >/dev/null")
 		, ("gpg2", "--version >/dev/null") ]
 	, TestCase "lsof" $ findCmdPath "lsof" "lsof"
+	, TestCase "gcrypt" $ findCmdPath "gcrypt" "git-remote-gcrypt"
 	, TestCase "ssh connection caching" getSshConnectionCaching
 	] ++ shaTestCases
 	[ (1, "da39a3ee5e6b4b0d3255bfef95601890afd80709")