diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..125c485
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vim/javacomplete"]
+	path = vim/javacomplete
+	url = git://github.com/ntietz/javacomplete.git
diff --git a/config.sh b/config.sh
index 7e859ec..8eb05e9 100755
--- a/config.sh
+++ b/config.sh
@@ -14,6 +14,8 @@ rm -f .vimrc
 ln -s ~/Repositories/config/vimrc .vimrc
 
 # set up the default branch for git
-git config --global branch.master.remote origin
+git config --global branch.master.remote github
 git config --global branch.master.merge refs/heads/master
 
+mkdir -p .vim
+
diff --git a/vim/javacomplete b/vim/javacomplete
new file mode 160000
index 0000000..f3d9ce9
--- /dev/null
+++ b/vim/javacomplete
@@ -0,0 +1 @@
+Subproject commit f3d9ce93b4452baf5cb15b68d3b2a925a10a6e7d