diff --git a/src/main/scala/util/Directory.scala b/src/main/scala/util/Directory.scala
index 8ea3325..a1a29a3 100644
--- a/src/main/scala/util/Directory.scala
+++ b/src/main/scala/util/Directory.scala
@@ -14,8 +14,16 @@
     case _ => scala.util.Properties.envOrNone("GITBUCKET_HOME") match {
       // environment variable GITBUCKET_HOME
       case Some(env) => new File(env)
-      // default is HOME/gitbucket
-      case None => new File(System.getProperty("user.home"), "gitbucket")
+      // default is HOME/.gitbucket
+      case None => {
+        // Move HOME/gitbucket to HOME/.gitbucket
+        val oldHome = new File(System.getProperty("user.home"), "gitbucket")
+        val newHome = new File(System.getProperty("user.home"), ".gitbucket")
+        if(oldHome.exists && oldHome.isDirectory && new File(oldHome, "data").exists){
+          oldHome.renameTo(newHome)
+        }
+        newHome
+      }
     }
   }).getAbsolutePath