diff --git a/.gitmodules b/.gitmodules
index b3023ec..c18d0ce 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,11 +38,8 @@
 	path = lib/git-modes
 	url = git@github.com:magit/git-modes.git
 [submodule "macrostep"]
-	# pending https://github.com/joddie/macrostep/pull/24
-	#     and https://github.com/joddie/macrostep/pull/26
-	remote = stale git@github.com:joddie/macrostep.git
 	path = lib/macrostep
-	url = git@github.com:tarsiiformes/macrostep.git
+	url = git@github.com:emacsorphanage/macrostep.git
 [submodule "magit"]
 	no-byte-compile = lisp/magit-libgit.el
 	path = lib/magit