diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07f40643..3ee91ef9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -708,12 +708,12 @@ ENDIF(NOT APPLE)
 
 # manual pages
 IF( UNIX )
-    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
-    IF( ENABLE_GTK )
-        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
-    ENDIF( ENABLE_GTK )
+    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
+    IF( ENABLE_GTK OR ENABLE_GTK3 )
+        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
+    ENDIF( ENABLE_GTK OR ENABLE_GTK3 )
     IF( ENABLE_WX )
-        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/wxvbam.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
+        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/visualboyadvance-m.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
     ENDIF( ENABLE_WX )
 ENDIF( UNIX )
 
diff --git a/src/debian/gvbam.1 b/src/debian/gvbam.6
similarity index 63%
rename from src/debian/gvbam.1
rename to src/debian/gvbam.6
index 0cb396fc..cac64593 100644
--- a/src/debian/gvbam.1
+++ b/src/debian/gvbam.6
@@ -1,9 +1,9 @@
-.TH gvbam 1 "March 28, 2012"
+.TH gvbam 6 "December 10, 2016"
 .SH NAME
 VBAM-GTK \- (aka
 .B gvbam
-) A gtk GUI for a high compatibility Gameboy Advance
-Emulator combining Visual Boy Advance developments.
+) A gtk+ GUI for a high compatibility Gameboy Advance
+Emulator integrating the best features from various Visual Boy Advance builds.
 .SH SYNOPSIS
 .B GVBAM
 .RI [ options ]
@@ -17,7 +17,7 @@ addition to the original Game Boy hand held systems and its Super and Color
 variants.
 .P
 VBA-M is a continued development of the now inactive VisualBoy
-Advance project, with many improvements from various developments of VBA.
+Advance project, with many improvements from various builds of VBA.
 .P
 This application is the GTK GUI version of VisualBoyAdvance-M.
 .SH OPTIONS
@@ -28,5 +28,5 @@ Output version information
 .B \-v, \-\-version
 Output version information
 .SH AUTHOR
-This manual page was written by Jeremy Newton <alexjnewt@hotmail.com>,
-for the RPMFusion and VBAM. This man page can be free used by anyone.
+This manual page was written by Jeremy Newton (Mystro256).
+This man page is licensed as GPLv2 or later.
diff --git a/src/debian/vbam.1 b/src/debian/vbam.6
similarity index 98%
rename from src/debian/vbam.1
rename to src/debian/vbam.6
index 37e7cd94..1da29478 100644
--- a/src/debian/vbam.1
+++ b/src/debian/vbam.6
@@ -1,4 +1,4 @@
-.TH "VBAM" "1" "January 2008" "VBA-M development team" "User Commands"
+.TH "VBAM" "6" "January 2008" "VBA-M development team" "User Commands"
 .SH "NAME"
 vbam \- manual page for VisualBoy Advance\-M
 .SH "DESCRIPTION"
diff --git a/src/debian/wxvbam.1 b/src/debian/visualboyadvance-m.6
similarity index 66%
rename from src/debian/wxvbam.1
rename to src/debian/visualboyadvance-m.6
index 1fd7c8a5..f0f94aea 100644
--- a/src/debian/wxvbam.1
+++ b/src/debian/visualboyadvance-m.6
@@ -1,11 +1,9 @@
-.TH wxvbam 1 "March 28, 2012"
+.TH visualboyadvance-m 6 "December 10, 2016"
 .SH NAME
-VBAM-WX \- (aka
-.B wxvbam
-) A wxWidgets GUI for a high compatibility Gameboy Advance
-Emulator combining Visual Boy Advance developments.
+VisualBoyAdvance-M - A wxWidgets GUI for a high compatibility Gameboy Advance
+Emulator integrating the best features from various Visual Boy Advance builds.
 .SH SYNOPSIS
-.B WXVBAM
+.B visualboyadvance-m
 .RI [ options ]
 .SH DESCRIPTION
 .B VisualBoyAdvance-M
@@ -17,7 +15,7 @@ addition to the original Game Boy hand held systems and its Super and Color
 variants.
 .P
 VBA-M is a continued development of the now inactive VisualBoy
-Advance project, with many improvements from various developments of VBA.
+Advance project, with many improvements from various builds of VBA.
 .P
 This application is the wxWidgets GUI version of VisualBoyAdvance-M.
 .SH OPTIONS
@@ -31,10 +29,10 @@ Generate verbose log messages
 .B \-\-save-xrc=<str>
 Save built-in XRC file and exit
 .TP
-.B \-\-save-over=<str> 
+.B \-\-save-over=<str>
 Save built-in vba-over.ini and exit
 .TP
-.B \-\-print-cfg-path 
+.B \-\-print-cfg-path
 Print configuration path and exit
 .TP
 .B \-f, \-\-fullscreen
@@ -46,5 +44,5 @@ Delete shared link state first, if it exists
 .B \-o, \-\-list-options
 List all settable options and exit
 .SH AUTHOR
-This manual page was written by Jeremy Newton <alexjnewt@hotmail.com>,
-for the RPMFusion and VBAM. This man page can be free used by anyone.
+This manual page was written by Jeremy Newton (Mystro256).
+This man page is licensed as GPLv2 or later.