diff --git a/Makefile b/Makefile
index 80ef01a..55c6aec 100644
--- a/Makefile
+++ b/Makefile
@@ -67,8 +67,8 @@ install-lib:
 
 install-man:
 	install -d $(DESTDIR)$(MAN3DIR)
-	for F in *.3; do \
-	  gzip <$$F >$(DESTDIR)$(MAN3DIR)/$$F.gz; \
+	for F in man/*.3; do \
+	  gzip <$$F >$(DESTDIR)$(MAN3DIR)/$${F#man/}.gz; \
 	done
 	ln -sf termkey_new.3.gz $(DESTDIR)$(MAN3DIR)/termkey_destroy.3.gz
 	ln -sf termkey_getkey.3.gz $(DESTDIR)$(MAN3DIR)/termkey_getkey_force.3.gz
@@ -78,7 +78,7 @@ install-man:
 
 # DIST CUT
 
-MANSOURCE=$(wildcard *.3.sh)
+MANSOURCE=$(wildcard man/*.3.sh)
 BUILTMAN=$(MANSOURCE:.3.sh=.3)
 
 VERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
diff --git a/termkey_advisereadable.3 b/man/termkey_advisereadable.3
similarity index 100%
rename from termkey_advisereadable.3
rename to man/termkey_advisereadable.3
diff --git a/termkey_canonicalise.3 b/man/termkey_canonicalise.3
similarity index 100%
rename from termkey_canonicalise.3
rename to man/termkey_canonicalise.3
diff --git a/termkey_get_buffer_remaining.3 b/man/termkey_get_buffer_remaining.3
similarity index 100%
rename from termkey_get_buffer_remaining.3
rename to man/termkey_get_buffer_remaining.3
diff --git a/termkey_get_fd.3 b/man/termkey_get_fd.3
similarity index 100%
rename from termkey_get_fd.3
rename to man/termkey_get_fd.3
diff --git a/termkey_get_keyname.3 b/man/termkey_get_keyname.3
similarity index 100%
rename from termkey_get_keyname.3
rename to man/termkey_get_keyname.3
diff --git a/termkey_getkey.3.sh b/man/termkey_getkey.3.sh
similarity index 100%
rename from termkey_getkey.3.sh
rename to man/termkey_getkey.3.sh
diff --git a/termkey_interpret_mouse.3 b/man/termkey_interpret_mouse.3
similarity index 100%
rename from termkey_interpret_mouse.3
rename to man/termkey_interpret_mouse.3
diff --git a/termkey_keycmp.3 b/man/termkey_keycmp.3
similarity index 100%
rename from termkey_keycmp.3
rename to man/termkey_keycmp.3
diff --git a/termkey_keyname2sym.3 b/man/termkey_keyname2sym.3
similarity index 100%
rename from termkey_keyname2sym.3
rename to man/termkey_keyname2sym.3
diff --git a/termkey_lookup_keyname.3 b/man/termkey_lookup_keyname.3
similarity index 100%
rename from termkey_lookup_keyname.3
rename to man/termkey_lookup_keyname.3
diff --git a/termkey_new.3 b/man/termkey_new.3
similarity index 100%
rename from termkey_new.3
rename to man/termkey_new.3
diff --git a/termkey_set_canonflags.3 b/man/termkey_set_canonflags.3
similarity index 100%
rename from termkey_set_canonflags.3
rename to man/termkey_set_canonflags.3
diff --git a/termkey_set_flags.3 b/man/termkey_set_flags.3
similarity index 100%
rename from termkey_set_flags.3
rename to man/termkey_set_flags.3
diff --git a/termkey_set_waittime.3 b/man/termkey_set_waittime.3
similarity index 100%
rename from termkey_set_waittime.3
rename to man/termkey_set_waittime.3
diff --git a/termkey_strfkey.3 b/man/termkey_strfkey.3
similarity index 100%
rename from termkey_strfkey.3
rename to man/termkey_strfkey.3
diff --git a/termkey_strpkey.3 b/man/termkey_strpkey.3
similarity index 100%
rename from termkey_strpkey.3
rename to man/termkey_strpkey.3
diff --git a/termkey_waitkey.3.sh b/man/termkey_waitkey.3.sh
similarity index 100%
rename from termkey_waitkey.3.sh
rename to man/termkey_waitkey.3.sh