diff --git a/src/main/scala/util/WikiUtil.scala b/src/main/scala/util/WikiUtil.scala
index 78c60bda7..bf6c0fe3a 100644
--- a/src/main/scala/util/WikiUtil.scala
+++ b/src/main/scala/util/WikiUtil.scala
@@ -32,13 +32,13 @@ object WikiUtil {
    * Returns the directory of the wiki repository.
    */
   def getWikiRepositoryDir(owner: String, repository: String): File =
-    new File("%s/%s/%s-wiki.git".format(Directory.RepositoryHome, owner, repository))
+    new File("%s/%s/%s.wiki.git".format(Directory.RepositoryHome, owner, repository))
   
   /**
    * Returns the directory of the wiki working directory which is cloned from the wiki repository.
    */
   def getWikiWorkDir(owner: String, repository: String): File = 
-    new File("%s/tmp/%s/%s-wiki".format(Directory.RepositoryHome, owner, repository))
+    new File("%s/tmp/%s/%s.wiki".format(Directory.RepositoryHome, owner, repository))
 
   // TODO synchronized?
   def createWikiRepository(owner: String, repository: String): Unit = {
diff --git a/src/main/twirl/wikitab.scala.html b/src/main/twirl/wikitab.scala.html
index 3345a9323..399281fab 100644
--- a/src/main/twirl/wikitab.scala.html
+++ b/src/main/twirl/wikitab.scala.html
@@ -7,7 +7,7 @@
   <li class="pull-right">
     <div class="input-prepend">
       <span class="add-on">HTTP</span>
-      <input type="text" value="@repository.url.replaceFirst("\\.git$", "-wiki.git")" style="width: 350px;">
+      <input type="text" value="@repository.url.replaceFirst("\\.git$", ".wiki.git")" style="width: 350px;">
     </div>
   </li>
 </ul>