diff --git a/.emacs.d b/.emacs.d
deleted file mode 160000
index a1b695a..0000000
--- a/.emacs.d
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a1b695a37c431e4aea9b4a6eb5242b0ea351a158
diff --git a/.gitignore b/.gitignore
index 5a9586e..f3175e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@
 .dmenu_cache
 .dvdcss/
 .easytag/
+.emass.d/
 .emacs-jabber/
 .face
 .filezilla/
diff --git a/.gitmodules b/.gitmodules
index ddeb067..2c0dce7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule ".zsh/syntax-highlighting"]
 	path = .zsh/syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting
-[submodule ".emacs.d"]
-	path = .emacs.d
-	url = git@gitorious.org:ryuslash/dotemacs.git