diff --git a/GNUmakefile b/GNUmakefile
index 50f836d..45fd82e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,28 @@
-.PHONY: all zsh
+include dotfiles.mk
 
-all: zsh
+MODULES=xmodmap
+
+.PHONY: all clean $(MODULES) zsh
+
+all: $(MODULES)
+
+clean: $(addsuffix -clean,$(MODULES))
+stow: $(addsuffix -stow,$(MODULES))
 
 zsh:
 	$(MAKE) -C $@
+
+###########
+# Xmodmap #
+###########
+
+xmodmap: Xmodmap/.Xmodmap
+
+Xmodmap/.Xmodmap: Xmodmap/Xmodmap.org
+	$(call tangle,fundamental)
+
+xmodmap-clean:
+	rm -f Xmodmap/.Xmodmap
+
+xmodmap-stow:
+	stow/usr/bin/stow-home Xmodmap
diff --git a/Xmodmap/GNUmakefile b/Xmodmap/GNUmakefile
deleted file mode 100644
index 30c1d75..0000000
--- a/Xmodmap/GNUmakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-include ../dotfiles.mk
-
-all: .Xmodmap
-
-.Xmodmap: .Xmodmap.org
-	$(call tangle,fundamental)
diff --git a/Xmodmap/.Xmodmap.org b/Xmodmap/Xmodmap.org
similarity index 100%
rename from Xmodmap/.Xmodmap.org
rename to Xmodmap/Xmodmap.org