diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75c61c2a..1ae7bf26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,8 @@ find_package(WLC REQUIRED)
 find_package(Wayland REQUIRED)
 find_package(XKBCommon REQUIRED)
 
+include(Manpage)
+
 include_directories(include)
 
 add_subdirectory(protocols)
@@ -61,12 +63,6 @@ add_subdirectory(swaymsg)
 add_subdirectory(swaygrab)
 add_subdirectory(swaybar)
 
-include(Manpage)
-add_manpage(sway 1)
-add_manpage(sway 5)
-add_manpage(swaymsg 1)
-add_manpage(swaygrab 1)
-
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop
 	DESTINATION share/wayland-sessions
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt
index 49ed24e7..aa553492 100644
--- a/sway/CMakeLists.txt
+++ b/sway/CMakeLists.txt
@@ -46,3 +46,6 @@ install(
 	DESTINATION ${FALLBACK_CONFIG_DIR}
 	COMPONENT configuration
 )
+
+add_manpage(sway 1)
+add_manpage(sway 5)
diff --git a/sway.1.txt b/sway/sway.1.txt
similarity index 100%
rename from sway.1.txt
rename to sway/sway.1.txt
diff --git a/sway.5.txt b/sway/sway.5.txt
similarity index 100%
rename from sway.5.txt
rename to sway/sway.5.txt
diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt
index d5468cda..f664c01d 100644
--- a/swaygrab/CMakeLists.txt
+++ b/swaygrab/CMakeLists.txt
@@ -13,3 +13,5 @@ install(
 	DESTINATION bin
 	COMPONENT runtime
 )
+
+add_manpage(swaygrab 1)
diff --git a/swaygrab.1.txt b/swaygrab/swaygrab.1.txt
similarity index 100%
rename from swaygrab.1.txt
rename to swaygrab/swaygrab.1.txt
diff --git a/swaymsg/CMakeLists.txt b/swaymsg/CMakeLists.txt
index 2481b280..06939991 100644
--- a/swaymsg/CMakeLists.txt
+++ b/swaymsg/CMakeLists.txt
@@ -12,3 +12,5 @@ install(
 	DESTINATION bin
 	COMPONENT runtime
 )
+
+add_manpage(swaymsg 1)
diff --git a/swaymsg.1.txt b/swaymsg/swaymsg.1.txt
similarity index 100%
rename from swaymsg.1.txt
rename to swaymsg/swaymsg.1.txt