diff --git a/client.qc b/client.qc
index 6e90daa..6bf4560 100644
--- a/client.qc
+++ b/client.qc
@@ -2388,8 +2388,11 @@ void() PlayerJump =
 		return;
 	}
 
-	if (!(self.flags & FL_ONGROUND))
+	if (!(self.flags & FL_ONGROUND)) {
+		if (no_pogo_stick)
+			self.flags &= ~FL_JUMPRELEASED;
 		return;
+	}
 
 	if (!(self.flags & FL_JUMPRELEASED) )
 		return;		// don't pogo stick
diff --git a/defs.qc b/defs.qc
index 921b111..c8a3432 100644
--- a/defs.qc
+++ b/defs.qc
@@ -1128,3 +1128,5 @@ float triggered_cycle;
 /*==================================================*/
 float deathmsg;		// Global, which is set before every T_Damage, to indicate
 					// the death message that should be used.
+
+float no_pogo_stick;
diff --git a/world.qc b/world.qc
index 1a68570..500c1b2 100644
--- a/world.qc
+++ b/world.qc
@@ -558,6 +558,7 @@ void() StartFrame =
 	timelimit = cvar("timelimit") * 60;
 	fraglimit = cvar("fraglimit");
 	deathmatch = cvar("deathmatch");
+	no_pogo_stick = cvar ("no_pogo_stick");
 	framecount = framecount + 1;
 
 	local string timeleft;