diff --git a/Makefile b/Makefile
index 9a9d1e5..45c5d18 100644
--- a/Makefile
+++ b/Makefile
@@ -270,7 +270,10 @@ setup-darwin-daemon:
 # -----------
 
 setup-emacs: $(dotfiles_dir)/emacs.el
-	$(emacs) -q --debug-init --batch --load $< -f my-auto-install-package
+	$(emacs) -q --batch \
+		--eval "(setq user-emacs-directory \"$(home)/.emacs.d/\")" \
+		--load $< \
+		-f my-auto-install-package
 
 
 
diff --git a/emacs.el b/emacs.el
index 7001d96..8e7426c 100644
--- a/emacs.el
+++ b/emacs.el
@@ -200,11 +200,11 @@ IF OK-IF-ALREADY-EXISTS is true force download."
     gnuplot-mode
     erlang
     js2-mode
-    git-commit-mode
+	git-commit
     gitignore-mode
     ;; ack
     color-moccur
-    gtags
+    ggtags
     flycheck
     ;; is flymake installs are required?
     ;;flymake-jshint
@@ -229,13 +229,13 @@ IF OK-IF-ALREADY-EXISTS is true force download."
     ;; 10sr repository
     terminal-title
     recentf-show
-    ;;dired-list-all-mode
+    dired-list-all-mode
     pack
     set-modeline-color
     read-only-only-mode
     smart-revert
     autosave
-    window-organizer
+	;;window-organizer
     remember-major-modes-mode
     ilookup
     pasteboard