diff --git a/Javacomplete.makefile b/Javacomplete2.makefile
similarity index 100%
rename from Javacomplete.makefile
rename to Javacomplete2.makefile
diff --git a/Makefile b/Makefile
index 2790943..b8fd909 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,6 @@ all: dist
 dist:
 	cd supertab; make
 	cd findAndroidManifest; make
-	cp Javacomplete.makefile javacomplete/Makefile; cd javacomplete; make
+	cp Javacomplete2.makefile javacomplete2/Makefile; cd javacomplete2; make
 	cp Snipmate.makefile snipmate/Makefile; cd snipmate; make
 	cd adbLogCat; make
diff --git a/android-install.sh b/android-install.sh
old mode 100755
new mode 100644
index 10439b0..4fc6a5b
--- a/android-install.sh
+++ b/android-install.sh
@@ -25,17 +25,17 @@ echo "let g:SuperTabDefaultCompletionType = 'context'" >> ~/.vimrc
 
 echo "[INFO] Cloning Supertab"
 git clone git://github.com/ervandew/supertab.git supertab
-echo "[INFO] Cloning Snipmate"
-git clone git://github.com/msanders/snipmate.vim.git snipmate
-echo "[INFO] Cloning javacomplete"
-git clone git://github.com/vim-scripts/javacomplete.git
+echo "[INFO] Cloning snipMate"
+git clone git://github.com/garbas/vim-snipmate.git snipmate
+echo "[INFO] Cloning javacomplete2"
+git clone git://github.com/artur-shaik/vim-javacomplete2.git javacomplete2
 
 echo "[BUILDING] Creating vimballs"
 make
 
-echo "[INSTALLING] Installing supertab, javacomplete, and findAndroidManifest"
+echo "[INSTALLING] Installing Supertab, snipMate, javacomplete2, and findAndroidManifest"
 vim findAndroidManifest/findmanifest.vmb -c 'so %' -c 'q!'
 vim supertab/supertab.vmb -c 'so %' -c 'q!'
-vim javacomplete/javacomplete.vmb -c 'so %' -c 'q!'
+vim javacomplete2/javacomplete.vmb -c 'so %' -c 'q!'
 vim snipmate/snipmate.vmb -c 'so %' -c 'q!'
 vim adbLogCat/adbLogCat.vmb -c 'so %' -c 'q!'