diff --git a/Makefile b/Makefile
index 402d24702912..33d4fc6b103f 100644
--- a/Makefile
+++ b/Makefile
@@ -163,14 +163,14 @@ install: $(TARGET)
 	mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(MAN_DIR)/man1 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
 	install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin 
 	install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
 	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
-	install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)/man1
-	install -m644 docs/retroarch-cg2glsl.1 $(DESTDIR)$(MAN_DIR)/man1
+	install -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
+	install -m644 docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
 	install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps
 
 uninstall:
@@ -178,8 +178,8 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop
-	rm -f $(DESTDIR)$(MAN_DIR)/man1/retroarch.1
-	rm -f $(DESTDIR)$(MAN_DIR)/man1/retroarch-cg2glsl.1
+	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
+	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
 	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg
 
 clean:
diff --git a/docs/retroarch-cg2glsl.1 b/docs/retroarch-cg2glsl.6
similarity index 86%
rename from docs/retroarch-cg2glsl.1
rename to docs/retroarch-cg2glsl.6
index 328f73fa8766..8c81b717e9e6 100644
--- a/docs/retroarch-cg2glsl.1
+++ b/docs/retroarch-cg2glsl.6
@@ -1,6 +1,6 @@
-.\" retroarch-cg2glsl.1
+.\" retroarch-cg2glsl.6
 
-.TH "RETROARCH-CG2GLSL" "1" "July 10, 2014" "RETROARCH-CG2GLSL" "System Manager's Manual: retroarch-cg2glsl"
+.TH "RETROARCH-CG2GLSL" "6" "July 10, 2014" "RETROARCH-CG2GLSL" "System Manager's Manual: retroarch-cg2glsl"
 
 .SH "NAME"
 
@@ -30,4 +30,4 @@ retroarch-cg2glsl prog.cg(p) prog.glsl(p)
 
 .TP
 \fBConvert a Cg directory to GLSL directory\fR
-retroarch-cg2glsl cg-dir out-xml-shader-dir
\ No newline at end of file
+retroarch-cg2glsl cg-dir out-xml-shader-dir
diff --git a/docs/retroarch-joyconfig.1 b/docs/retroarch-joyconfig.6
similarity index 95%
rename from docs/retroarch-joyconfig.1
rename to docs/retroarch-joyconfig.6
index 76dfe90cfbc2..b20f3b9b50c8 100644
--- a/docs/retroarch-joyconfig.1
+++ b/docs/retroarch-joyconfig.6
@@ -1,6 +1,6 @@
-.\" retroarch-joyconfig.1:
+.\" retroarch-joyconfig.6:
 
-.TH  "RETROARCH-JOYCONFIG" "1" "October 1, 2011" "RETROARCH-JOYCONFIG" "System Manager's Manual: retroarch-joyconfig"
+.TH  "RETROARCH-JOYCONFIG" "6" "October 1, 2011" "RETROARCH-JOYCONFIG" "System Manager's Manual: retroarch-joyconfig"
 
 .SH NAME
 
@@ -78,6 +78,6 @@ Adds a timeout of N seconds to each bind. If timed out, the bind will not be use
 Prints help message.
 
 .SH "SEE ALSO"
-\fBretroarch\fR(1)
+\fBretroarch\fR(6)
 
 .\"
diff --git a/docs/retroarch.1 b/docs/retroarch.6
similarity index 98%
rename from docs/retroarch.1
rename to docs/retroarch.6
index 4be90ebae3ed..07a2789f4c49 100644
--- a/docs/retroarch.1
+++ b/docs/retroarch.6
@@ -1,6 +1,6 @@
-.\" retroarch.1:
+.\" retroarch.6:
 
-.TH  "RETROARCH" "1" "November 1, 2011" "RETROARCH" "System Manager's Manual: retroarch"
+.TH  "RETROARCH" "6" "November 1, 2011" "RETROARCH" "System Manager's Manual: retroarch"
 
 .SH NAME
 
@@ -235,4 +235,4 @@ Disables all kinds of content patching.
 Detach from the current console. This is currently only relevant for Microsoft Windows.
 
 .SH "SEE ALSO"
-\fBretroarch-joyconfig\fR(1)
+\fBretroarch-joyconfig\fR(6)