diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp
index 545ef53..9367319 100644
--- a/lib/Basic/Version.cpp
+++ b/lib/Basic/Version.cpp
@@ -31,8 +31,10 @@
   // If the SVN_REPOSITORY is empty, try to use the SVN keyword. This helps us
   // pick up a tag in an SVN export, for example.
   static llvm::StringRef SVNRepository("$URL$");
-  if (URL.empty())
-    URL = SVNRepository.split(':').second;
+  if (URL.empty()) {
+    URL = SVNRepository.slice(SVNRepository.find(':'),
+                              SVNRepository.find("/lib/Basic"));
+  }
 
   // Strip off version from a build from an integration branch.
   URL = URL.slice(0, URL.find("/src/tools/clang"));