diff --git a/Assistant/WebApp/Configurators/Delete.hs b/Assistant/WebApp/Configurators/Delete.hs
index 8db07211c0..d3393d1234 100644
--- a/Assistant/WebApp/Configurators/Delete.hs
+++ b/Assistant/WebApp/Configurators/Delete.hs
@@ -104,7 +104,7 @@ deleteCurrentRepository = dangerPage $ do
 			liftIO $ do
 				recurseDir SystemFS dir
 					>>= mapM_ (void . tryIO . allowWrite)
-				removeDirectoryRecursive dir
+				removeDirectoryRecursive =<< absPath dir
 			
 			redirect ShutdownConfirmedR
 		_ -> $(widgetFile "configurators/delete/currentrepository")
diff --git a/debian/changelog b/debian/changelog
index 962c76d22f..ffe840aa7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ git-annex (6.20160127) UNRELEASED; urgency=medium
     adding files not matching annex.largefiles.
   * Fix reversion in lookupkey, contentlocation, and examinekey which
     caused them to sometimes output side messages.
+  * webapp: Fix deletion of current repository directory.
 
  -- Joey Hess <id@joeyh.name>  Thu, 28 Jan 2016 13:53:09 -0400
 
diff --git a/doc/bugs/removeDirectoryRecursive.mdwn b/doc/bugs/removeDirectoryRecursive.mdwn
index 3b8ab239bf..b1b3630d1f 100644
--- a/doc/bugs/removeDirectoryRecursive.mdwn
+++ b/doc/bugs/removeDirectoryRecursive.mdwn
@@ -27,4 +27,4 @@ I just downloaded and installed Git Annex. This problem was there from day 1.
 
 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
 
-
+> Fixed it to properly delete the repo. [[done]] --[[Joey]]
diff --git a/doc/bugs/removeDirectoryRecursive/comment_1_dc8d7f4072833b013e17935b657a9cdd._comment b/doc/bugs/removeDirectoryRecursive/comment_1_dc8d7f4072833b013e17935b657a9cdd._comment
new file mode 100644
index 0000000000..db96cf35b7
--- /dev/null
+++ b/doc/bugs/removeDirectoryRecursive/comment_1_dc8d7f4072833b013e17935b657a9cdd._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-01-29T17:59:18Z"
+ content="""
+Reproduced this. The repository deletion seems to work, except it falls on
+the last hurdle, of removing the actual repository itself. This also
+prevents the webapp from shutting down properly.
+
+So, to get out of this state, kill git-annex and delete the directory
+yourself.
+"""]]