diff --git a/Makefile b/Makefile
index 0c1c2633..492282ce 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ rgbgfx_obj = \
 all: rgbasm rgblink rgbfix rgbgfx
 
 clean:
-	$Q${RM} rgbds.7.html gbz80.7.html rgbds.rgbformat.5.html
+	$Q${RM} rgbds.7.html gbz80.7.html rgbds.5.html
 	$Q${RM} rgbasm rgbasm.exe ${rgbasm_obj} rgbasm.1.html rgbasm.5.html
 	$Q${RM} rgblink rgblink.exe ${rgblink_obj} rgblink.1.html rgblink.5.html
 	$Q${RM} rgbfix rgbfix.exe ${rgbfix_obj} rgbfix.1.html
@@ -80,7 +80,7 @@ install: all
 	$Qmkdir -p ${DESTDIR}${mandir}/man1 ${DESTDIR}${mandir}/man5 ${DESTDIR}${mandir}/man7
 	$Qinstall -m ${MANMODE} src/rgbds.7 ${DESTDIR}${mandir}/man7/rgbds.7
 	$Qinstall -m ${MANMODE} src/gbz80.7 ${DESTDIR}${mandir}/man7/gbz80.7
-	$Qinstall -m ${MANMODE} src/rgbds.rgbformat.5 ${DESTDIR}${mandir}/man7/rgbds.rgbformat.5
+	$Qinstall -m ${MANMODE} src/rgbds.5 ${DESTDIR}${mandir}/man7/rgbds.5
 	$Qinstall -m ${MANMODE} src/asm/rgbasm.1 ${DESTDIR}${mandir}/man1/rgbasm.1
 	$Qinstall -m ${MANMODE} src/asm/rgbasm.5 ${DESTDIR}${mandir}/man1/rgbasm.5
 	$Qinstall -m ${MANMODE} src/fix/rgbfix.1 ${DESTDIR}${mandir}/man1/rgbfix.1
@@ -138,7 +138,7 @@ MANDOC =	-Thtml -Ios=General -Oman=%N.%S.html -Ostyle=manual.css
 wwwman:
 	$Qmandoc ${MANDOC} src/rgbds.7 > rgbds.7.html
 	$Qmandoc ${MANDOC} src/gbz80.7 > gbz80.7.html
-	$Qmandoc ${MANDOC} src/rgbds.rgbformat.5 > rgbds.rgbformat.5.html
+	$Qmandoc ${MANDOC} src/rgbds.5 > rgbds.5.html
 	$Qmandoc ${MANDOC} src/asm/rgbasm.1 > rgbasm.1.html
 	$Qmandoc ${MANDOC} src/asm/rgbasm.5 > rgbasm.5.html
 	$Qmandoc ${MANDOC} src/fix/rgbfix.1 > rgbfix.1.html
diff --git a/src/asm/rgbasm.1 b/src/asm/rgbasm.1
index 7dc500c3..15655fb2 100644
--- a/src/asm/rgbasm.1
+++ b/src/asm/rgbasm.1
@@ -12,7 +12,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd April 12, 2017
+.Dd April 17, 2017
 .Dt RGBASM 1
 .Os RGBDS Manual
 .Sh NAME
@@ -85,7 +85,7 @@ and
 .Xr rgbasm 5 ,
 .Xr rgbfix 1 ,
 .Xr rgblink 1 ,
-.Xr rgbds.rgbformat 5 ,
+.Xr rgbds 5 ,
 .Xr rgbds 7 ,
 .Xr gbz80 7
 .Pp
diff --git a/src/asm/rgbasm.5 b/src/asm/rgbasm.5
index edc946cc..402ef87a 100644
--- a/src/asm/rgbasm.5
+++ b/src/asm/rgbasm.5
@@ -12,7 +12,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd April 16, 2017
+.Dd April 17, 2017
 .Dt RGBASM 5
 .Os RGBDS Manual
 .Sh NAME
@@ -997,7 +997,7 @@ machine.
 .Xr rgbasm 1 ,
 .Xr rgblink 1 ,
 .Xr rgblink 5 ,
-.Xr rgbds.rgbformat 5 ,
+.Xr rgbds 5 ,
 .Xr rgbds 7 ,
 .Xr gbz80 7
 .Sh HISTORY
diff --git a/src/link/rgblink.1 b/src/link/rgblink.1
index 793193b8..32570744 100644
--- a/src/link/rgblink.1
+++ b/src/link/rgblink.1
@@ -12,7 +12,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd April 12, 2017
+.Dd April 17, 2017
 .Dt RGBLINK 1
 .Os RGBDS Manual
 .Sh NAME
@@ -113,7 +113,7 @@ to fix these so that the program will actually run in a Game Boy:
 .Xr rgbasm 1 ,
 .Xr rgblink 5 ,
 .Xr rgbfix 1 ,
-.Xr rgbds.rgbformat 5 ,
+.Xr rgbds 5 ,
 .Xr rgbds 7
 .Sh HISTORY
 .Nm
diff --git a/src/link/rgblink.5 b/src/link/rgblink.5
index 3954a58e..d5033c48 100644
--- a/src/link/rgblink.5
+++ b/src/link/rgblink.5
@@ -12,7 +12,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd April 16, 2017
+.Dd April 17, 2017
 .Dt RGBLINK 5
 .Os RGBDS Manual
 .Sh NAME
@@ -92,7 +92,7 @@ linkerscript. The address and alignment musn't be set.
 .Xr rgbasm 1 ,
 .Xr rgblink 1 ,
 .Xr rgbfix 1 ,
-.Xr rgbds.rgbformat 5 ,
+.Xr rgbds 5 ,
 .Xr rgbds 7
 .Sh HISTORY
 .Nm
diff --git a/src/rgbds.rgbformat.5 b/src/rgbds.5
similarity index 98%
rename from src/rgbds.rgbformat.5
rename to src/rgbds.5
index b8fd0741..c6b85f2c 100644
--- a/src/rgbds.rgbformat.5
+++ b/src/rgbds.5
@@ -12,12 +12,12 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd April 13, 2017
-.Dt RGBDS.RGBFORMAT 5
+.Dd April 17, 2017
+.Dt RGBDS 5
 .Os RGBDS Manual
 .Sh NAME
-.Nm rgbds.rgbformat
-.Nd file format documentation
+.Nm rgbds
+.Nd object file format documentation
 .Sh DESCRIPTION
 This is the description of the object files used by
 .Xr rgbasm 1
diff --git a/src/rgbds.7 b/src/rgbds.7
index 31e513b7..5ecb785f 100644
--- a/src/rgbds.7
+++ b/src/rgbds.7
@@ -12,7 +12,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd April 12, 2017
+.Dd April 17, 2017
 .Dt RGBDS 7
 .Os RGBDS Manual
 .Sh NAME
@@ -28,7 +28,7 @@ To get a working ROM image from a single assembly source file:
 .Xr rgbasm 1 ,
 .Xr rgbfix 1 ,
 .Xr rgblink 1 ,
-.Xr rgbds.rgbformat 5 ,
+.Xr rgbds 5 ,
 .Xr gbz80 7
 .Sh HISTORY
 .Bl -ohang