diff --git a/Makefile.am b/Makefile.am
index a1644f5f..e458a11d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -222,9 +222,9 @@ EXTRA_DIST+=\
 ##
 
 
-update-manpage: $(top_srcdir)/doc/rofi-manpage.markdown $(top_srcdir)/doc/rofi-theme-manpage.markdown
-	ronn --roff --pipe $(top_srcdir)/doc/rofi-manpage.markdown > $(top_srcdir)/doc/rofi.1
-	ronn --roff --pipe $(top_srcdir)/doc/rofi-theme-manpage.markdown > $(top_srcdir)/doc/rofi-theme.5
+update-manpage: $(top_srcdir)/doc/rofi.1.markdown $(top_srcdir)/doc/rofi-theme.5.markdown
+	ronn --roff $(top_srcdir)/doc/rofi.1.markdown
+	ronn --roff $(top_srcdir)/doc/rofi-theme.5.markdown
 
 ##
 # Rofi test program
diff --git a/doc/meson.build b/doc/meson.build
index 9b5ee0e1..f3c5443e 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,9 +1,9 @@
 ronn = find_program('ronn', required: false)
 if ronn.found()
     run_target('update-manpage',
-        command: [ ronn, files(
-            'rofi-manpage.markdown',
-            'rofi-theme-manpage.markdown',
+        command: [ ronn, '--roff', files(
+            'rofi.1.markdown',
+            'rofi-theme.5.markdown',
         )]
     )
 endif
diff --git a/doc/rofi-theme.5 b/doc/rofi-theme.5
index 1b9d5515..0ea61596 100644
--- a/doc/rofi-theme.5
+++ b/doc/rofi-theme.5
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ROFI\-THEME\-MANPAGE" "" "July 2017" "" ""
+.TH "ROFI\-THEME" "5" "July 2017" "" ""
 .
 .SH "NAME"
 \fBrofi\-theme\fR \- Rofi theme format files
diff --git a/doc/rofi-theme-manpage.markdown b/doc/rofi-theme.5.markdown
similarity index 100%
rename from doc/rofi-theme-manpage.markdown
rename to doc/rofi-theme.5.markdown
diff --git a/doc/rofi.1 b/doc/rofi.1
index 53825c49..6e335778 100644
--- a/doc/rofi.1
+++ b/doc/rofi.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ROFI\-MANPAGE" "" "July 2017" "" ""
+.TH "ROFI" "1" "July 2017" "" ""
 .
 .SH "NAME"
 \fBrofi\fR \- A window switcher, application launcher, ssh dialog and dmenu replacement
diff --git a/doc/rofi-manpage.markdown b/doc/rofi.1.markdown
similarity index 100%
rename from doc/rofi-manpage.markdown
rename to doc/rofi.1.markdown