diff --git a/third-party/svnkit-dav/src/main/java/org/tmatesoft/svn/core/internal/server/dav/DAVRepositoryManager.java b/third-party/svnkit-dav/src/main/java/org/tmatesoft/svn/core/internal/server/dav/DAVRepositoryManager.java
index 146777abf2..0684239983 100644
--- a/third-party/svnkit-dav/src/main/java/org/tmatesoft/svn/core/internal/server/dav/DAVRepositoryManager.java
+++ b/third-party/svnkit-dav/src/main/java/org/tmatesoft/svn/core/internal/server/dav/DAVRepositoryManager.java
@@ -12,7 +12,6 @@
 package org.tmatesoft.svn.core.internal.server.dav;
 
 import java.io.File;
-import java.net.URLDecoder;
 import java.security.Principal;
 import java.util.List;
 import java.util.Map;
@@ -65,7 +64,7 @@ public class DAVRepositoryManager {
         myUserPrincipal = request.getUserPrincipal();
         myRepositoryRootDir = getRepositoryRootDir(request.getPathInfo());
         myResourcePathInfo = getResourcePathInfo(request);
-            
+        
         if (config.isUsingPBA()) {
             String path = null;
             if (!DAVHandlerFactory.METHOD_MERGE.equals(request.getMethod())) {
diff --git a/third-party/svnkit-dav/src/main/java/org/tmatesoft/svn/core/internal/server/dav/handlers/DAVResponse.java b/third-party/svnkit-dav/src/main/java/org/tmatesoft/svn/core/internal/server/dav/handlers/DAVResponse.java
index 62348973b9..19501733f1 100644
--- a/third-party/svnkit-dav/src/main/java/org/tmatesoft/svn/core/internal/server/dav/handlers/DAVResponse.java
+++ b/third-party/svnkit-dav/src/main/java/org/tmatesoft/svn/core/internal/server/dav/handlers/DAVResponse.java
@@ -11,6 +11,7 @@
  */
 package org.tmatesoft.svn.core.internal.server.dav.handlers;
 
+import org.tmatesoft.svn.core.internal.util.SVNEncodingUtil;
 
 /**
  * @version 1.1.2
@@ -25,7 +26,8 @@ public class DAVResponse {
     
     public DAVResponse(String description, String href, DAVResponse nextResponse, DAVPropsResult propResult, int statusCode) {
         myDescription = description;
-        myHref = href;
+        // encode href to fix scm-manager issue #22
+        myHref = SVNEncodingUtil.uriEncode(href);
         myNextResponse = nextResponse;
         myStatusCode = statusCode;
         myPropResult = propResult;