diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index e13afe5d48..c28b209685 100644
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -29,7 +29,7 @@ stdParams params = do
 	b <- getEnv "GPG_BATCH"
 	let batch = if isNothing e && isNothing b
 		then []
-		else ["--batch", "--no-tty"]
+		else ["--batch", "--no-tty", "--use-agent"]
 	return $ batch ++ defaults ++ toCommand params
 	where
 		-- be quiet, even about checking the trustdb
diff --git a/debian/changelog b/debian/changelog
index 1c48a196d5..d81d1661d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 git-annex (3.20120808) UNRELEASED; urgency=low
 
   * S3: Add fileprefix setting.
+  * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 09 Aug 2012 13:51:47 -0400
 
diff --git a/doc/bugs/gpg_needs_--use-agent.mdwn b/doc/bugs/gpg_needs_--use-agent.mdwn
index 481b5cc17f..d9977909ba 100644
--- a/doc/bugs/gpg_needs_--use-agent.mdwn
+++ b/doc/bugs/gpg_needs_--use-agent.mdwn
@@ -48,3 +48,6 @@ A patch to fix this issue:
             -- be quiet, even about checking the trustdb
     -- 
     1.7.10.4
+
+> Thanks, [[done]].. I never noticed this since I have use-agent set in
+> gpg.conf. --[[Joey]