diff --git a/config/docs.cfg b/config/docs.cfg
index 5f092eb9..fcb64644 100644
--- a/config/docs.cfg
+++ b/config/docs.cfg
@@ -336,7 +336,7 @@ docremark [You should never have to use this command manually, use "bind" instea
 docident [left] [Moves the player left.];
 docremark [default keys: A and Left Arrow];
 docident [maxfps] [Limits the FPS (frames per second) of the game.];
-docargument [V] [maximum FPS] [min 0/max 200/default 200];
+docargument [V] [maximum FPS] [min 25/max 200/default 200];
 docident [maxroll] [Sets the maximum value the display will roll on strafing.];
 docargument [N] [the roll value] [min 0/max 20/default 0];
 docident [maxtmus] [Gets the maximum number of supported textures when performing multitexturing.];
diff --git a/docs/reference.xml b/docs/reference.xml
index 51c38e21..4c5954b5 100644
--- a/docs/reference.xml
+++ b/docs/reference.xml
@@ -1663,7 +1663,7 @@ echo foo
 
 				<variable name="maxfps">
 					<description>Limits the FPS (frames per second) of the game.</description>
-					<value token="V" description="maximum FPS" minValue="0" maxValue="200" defaultValue="200"/>
+					<value token="V" description="maximum FPS" minValue="25 or 0" maxValue="200" defaultValue="200" valueNotes="0 disables maxfps"/>
 				</variable>
 
 				<variable name="maxtmus">
diff --git a/source/src/main.cpp b/source/src/main.cpp
index 1e6a4d3d..24519f2f 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -677,7 +677,7 @@ void resetgl()
 
 COMMAND(resetgl, ARG_NONE);
 
-VARP(maxfps, 0, 200, 1000);
+VARFP(maxfps, 0, 200, 1000, if(maxfps && maxfps < 25) maxfps = 25);
 
 void limitfps(int &millis, int curmillis)
 {