diff --git a/debian/changelog b/debian/changelog
index f930df2ab4..14e6f81f85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ git-annex (4.20130724) UNRELEASED; urgency=low
     the client is a git-annex client. Closes: #717652
   * webapp: When creating a repository on a removable drive, set
     core.fsyncobjectfiles, to help prevent data loss when the drive is yanked.
+  * Always build with -threaded, to avoid a deadlock when communicating with
+    gpg.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 23 Jul 2013 12:39:48 -0400
 
diff --git a/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn b/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn
index 2eaebe2909..b4aaa57ea1 100644
--- a/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn
+++ b/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn
@@ -74,3 +74,5 @@ $> ps ax | grep gpg | grep -v ssh
 
 # End of transcript or log.
 """]]
+
+> [[done]]; see comments --[[Joey]] 
diff --git a/git-annex.cabal b/git-annex.cabal
index cfaeacb036..b9715b8475 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -82,6 +82,8 @@ Executable git-annex
   GHC-Options: -Wall
   CPP-Options: -DWITH_CLIBS
   Extensions: PackageImports
+  -- Some things don't work with the non-threaded RTS.
+  GHC-Options: -threaded
 
   if flag(Production)
     GHC-Options: -O2
@@ -139,7 +141,6 @@ Executable git-annex
      blaze-builder, crypto-api, hamlet, clientsession, aeson,
      template-haskell, data-default
     CPP-Options: -DWITH_WEBAPP
-    GHC-Options: -threaded
 
   if flag(Pairing)
     Build-Depends: network-multicast, network-info