diff --git a/emacs/eshell/alias b/.emacs.d/eshell/alias
similarity index 100%
rename from emacs/eshell/alias
rename to .emacs.d/eshell/alias
diff --git a/emacs/gnus.el b/.emacs.d/gnus.el
similarity index 97%
rename from emacs/gnus.el
rename to .emacs.d/gnus.el
index 1f629b5..1bf988a 100644
--- a/emacs/gnus.el
+++ b/.emacs.d/gnus.el
@@ -68,7 +68,3 @@
 (bbdb-initialize 'gnus 'message)
 (bbdb-insinuate-gnus)
 (setq bbdb-north-american-phone-numbers-p nil)
-
-;; Local Variables:
-;; no-update-autoloads: t
-;; End:
diff --git a/emacs/init.el b/.emacs.d/init.el
similarity index 99%
rename from emacs/init.el
rename to .emacs.d/init.el
index 41765af..6957cd5 100644
--- a/emacs/init.el
+++ b/.emacs.d/init.el
@@ -812,6 +812,7 @@ for easy selection."
 (setq gtags-auto-update t)
 (setq help-at-pt-display-when-idle t)
 (setq ido-auto-merge-delay-time 1000000)
+(setq ido-default-buffer-method 'selected-window)
 (setq ido-max-window-height 1)
 (setq ido-save-directory-list-file nil)
 (setq ido-ubiquitous-exceptions '(tmm-prompt))
@@ -1044,6 +1045,7 @@ for easy selection."
 (electric-indent-mode)
 (electric-pair-mode)
 (ido-mode)
+(ido-ubiquitous)
 (savehist-mode)
 (show-paren-mode)
 (auto-insert-mode)
diff --git a/.gitignore b/.gitignore
index d4280cd..18ca469 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@
 .dmenu_cache
 .dvdcss/
 .easytag/
-.emass.d/
 .emacs-jabber/
 .face
 .filezilla/
@@ -101,7 +100,6 @@ var/
 xhtml-loader.rnc
 .unison/
 .pencil/
-.emacs.d/
 .cuyo
 .lgames
 .beetsmusic.blb
diff --git a/emacs/Makefile b/emacs/Makefile
deleted file mode 100644
index 51a55a4..0000000
--- a/emacs/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-EMACS = emacs
-
-files = init.el init.elc
-install-files = $(addprefix install-,$(files))
-submodules = eshell
-install-submodules = $(addprefix install-,$(submodules))
-
-.PHONY: all $(submodules) install $(install-submodules) $(install-files)
-
-all: $(files) $(submodules)
-
-$(submodules):
-	$(MAKE) -C $@/
-
-$(filter %.elc,$(files)): %.elc: %.el
-	$(EMACS) -batch -eval "(byte-compile-file \"$^\")"
-
-install: $(install-files) $(install-submodules)
-
-$(install-files): install-%: $*
-	install -Dm 444 $* ${HOME}/.emacs.d/$*
-
-$(install-submodules): install-%:
-	$(MAKE) -C $*/ install
diff --git a/emacs/eshell/Makefile b/emacs/eshell/Makefile
deleted file mode 100644
index a28a794..0000000
--- a/emacs/eshell/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-.PHONY: all install
-
-all:
-
-install:
-	install -Dm 444 alias ${HOME}/.emacs.d/eshell/alias