diff --git a/CHANGELOG b/CHANGELOG
index 7564093440..6446d587d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ git-annex (6.20160614) UNRELEASED; urgency=medium
     as such a deletion will never finish.
     Thanks, Farhan Kathawala.
   * get: Add --batch and --json options.
+  * New url for git-remote-gcrypt, now maintained by spwhitton.
 
  -- Joey Hess <id@joeyh.name>  Mon, 13 Jun 2016 21:52:24 -0400
 
diff --git a/Git/GCrypt.hs b/Git/GCrypt.hs
index 46da372575..2a2f7dfe15 100644
--- a/Git/GCrypt.hs
+++ b/Git/GCrypt.hs
@@ -1,6 +1,6 @@
 {- git-remote-gcrypt support
  -
- - https://github.com/blake2-ppc/git-remote-gcrypt
+ - https://spwhitton.name/tech/code/git-remote-gcrypt/
  -
  - Copyright 2013 Joey Hess <id@joeyh.name>
  -
diff --git a/doc/design/assistant/cloud.mdwn b/doc/design/assistant/cloud.mdwn
index aa0eba382f..f0452df2a9 100644
--- a/doc/design/assistant/cloud.mdwn
+++ b/doc/design/assistant/cloud.mdwn
@@ -41,5 +41,5 @@ Another option is to not store the git repo in the cloud, but push/pull
 peer-to-peer. When peers cannot directly talk to one-another, this could be
 bounced through something like XMPP. This is **done** for [[xmpp]]!
 
-Another option: Use <https://github.com/blake2-ppc/git-remote-gcrypt> to store
+Another option: Use <https://spwhitton.name/tech/code/git-remote-gcrypt/> to store
 git repo encrypted on cloud storage.
diff --git a/doc/design/assistant/encrypted_git_remotes.mdwn b/doc/design/assistant/encrypted_git_remotes.mdwn
index 7d210a292d..b7e817cff4 100644
--- a/doc/design/assistant/encrypted_git_remotes.mdwn
+++ b/doc/design/assistant/encrypted_git_remotes.mdwn
@@ -1,5 +1,5 @@
 Encrypted git remotes are now possible 
-using [git-remote-gcrypt](https://github.com/joeyh/git-remote-gcrypt).
+using [git-remote-gcrypt](https://spwhitton.name/tech/code/git-remote-gcrypt/).
 
 There are at least two use cases for this in the assistant:
 
diff --git a/doc/special_remotes/gcrypt.mdwn b/doc/special_remotes/gcrypt.mdwn
index d5f3f7b5b9..5807c9e5f2 100644
--- a/doc/special_remotes/gcrypt.mdwn
+++ b/doc/special_remotes/gcrypt.mdwn
@@ -1,4 +1,4 @@
-[git-remote-gcrypt](https://github.com/joeyh/git-remote-gcrypt/)
+[git-remote-gcrypt](https://spwhitton.name/tech/code/git-remote-gcrypt/)
 adds support for encrypted remotes to git. The git-annex gcrypt special
 remote allows git-annex to also store its files in such repositories.
 Naturally, git-annex encrypts the files it stores too, so everything
diff --git a/doc/tips/fully_encrypted_git_repositories_with_gcrypt.mdwn b/doc/tips/fully_encrypted_git_repositories_with_gcrypt.mdwn
index 2b038b2ca9..3544691187 100644
--- a/doc/tips/fully_encrypted_git_repositories_with_gcrypt.mdwn
+++ b/doc/tips/fully_encrypted_git_repositories_with_gcrypt.mdwn
@@ -1,4 +1,4 @@
-[git-remote-gcrypt](https://github.com/joeyh/git-remote-gcrypt/)
+[git-remote-gcrypt](https://spwhitton.name/tech/code/git-remote-gcrypt/)
 adds support for encrypted remotes to git. The git-annex 
 [[gcrypt special remote|special_remotes/gcrypt]] allows git-annex to
 also store its files in such repositories. Naturally, git-annex encrypts
@@ -14,8 +14,7 @@ repositories.
 
 ## prerequisites
 
-* Install
-[git-remote-gcrypt](https://github.com/joeyh/git-remote-gcrypt/)
+* Install [git-remote-gcrypt](https://spwhitton.name/tech/code/git-remote-gcrypt/)
 * Install git-annex version 4.20130909 or newer.
 
 ## encrypted backup drive
diff --git a/templates/configurators/needgcrypt.hamlet b/templates/configurators/needgcrypt.hamlet
index cdf6213743..d6dab11ab3 100644
--- a/templates/configurators/needgcrypt.hamlet
+++ b/templates/configurators/needgcrypt.hamlet
@@ -4,7 +4,7 @@
       Need git-remote-gcrypt
     <p>
       To encrypt git repositories, you need to install #
-      <a href="https://github.com/joeyh/git-remote-gcrypt">
+      <a href="https://spwhitton.name/tech/code/git-remote-gcrypt/">
         git-remote-gcrypt
     <p>
       <a .btn .btn-primary .btn-lg href="">