diff --git a/Assistant/WebApp/Configurators/Ssh.hs b/Assistant/WebApp/Configurators/Ssh.hs
index 1d31476d26..fb53e43939 100644
--- a/Assistant/WebApp/Configurators/Ssh.hs
+++ b/Assistant/WebApp/Configurators/Ssh.hs
@@ -310,7 +310,8 @@ makeRsyncNet sshinput setup = do
 	keypair <- liftIO $ genSshKeyPair
 	sshdata <- liftIO $ setupSshKeyPair keypair $
 		(mkSshData sshinput)
-			{ sshRepoName = "rsync.net"
+			{ sshRepoName = genSshRepoName "rsync.net" 
+				(maybe "" T.unpack $ directory sshinput)
 			, needsPubKey = True
 			, rsyncOnly = True
 			}
diff --git a/debian/changelog b/debian/changelog
index 4d68c0cfdd..9cfce3c464 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ git-annex (3.20121018) UNRELEASED; urgency=low
     ~/.ssh/git-annex-shell wrapper the first time it's run.
   * webapp: Make an initial, empty commit so there is a master branch 
   * assistant: Fix syncing local drives.
+  * webapp: Fix creation of rsync.net repositories.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 17 Oct 2012 14:24:10 -0400