diff --git a/src/d_player.h b/src/d_player.h
index 65333ecce1e58d0fbb458136c3a809ece87f789a..3bced1a8b6d1c11560ae4ccffd0278bc38a4beb2 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -38,6 +38,7 @@ typedef enum
 	SF_HIRES            = 1<<3, // Draw the sprite 2x as small?
 	SF_NOSKID           = 1<<4, // No skid particles etc
 	SF_NOSPEEDADJUST    = 1<<5, // Skin-specific version of disablespeedadjust
+	SF_RUNONWATER       = 1<<6, // Run on top of water FOFs?
 } skinflags_t;
 
 //Primary and secondary skin abilities
diff --git a/src/dehacked.c b/src/dehacked.c
index 284d82c3d5974371e20263ab739addf4560d7ad8..37bd529504b18f06cef5631975997ec63532428c 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7507,6 +7507,7 @@ struct {
 	{"SF_HIRES",SF_HIRES},
 	{"SF_NOSKID",SF_NOSKID},
 	{"SF_NOSPEEDADJUST",SF_NOSPEEDADJUST},
+	{"SF_RUNONWATER",SF_RUNONWATER},
 
 	// Character abilities!
 	// Primary
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 29ba5d04308e18e0d95e3adb6a3ba1dbb3ba5900..eaf57e57d39cd3774b7516739a74564da454abfd 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2398,7 +2398,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
 boolean P_CanRunOnWater(player_t *player, ffloor_t *rover)
 {
 	if (!(player->pflags & PF_NIGHTSMODE) && !player->homing
-		&& (((player->charability == CA_SWIM) || player->powers[pw_super]) && player->mo->ceilingz-*rover->topheight >= player->mo->height)
+		&& (((player->charability == CA_SWIM) || player->powers[pw_super] || player->charflags & SF_RUNONWATER) && player->mo->ceilingz-*rover->topheight >= player->mo->height)
 		&& (rover->flags & FF_SWIMMABLE) && !(player->pflags & PF_SPINNING) && player->speed > FixedMul(player->runspeed, player->mo->scale)
 		&& !(player->pflags & PF_SLIDING)
 		&& abs(player->mo->z - *rover->topheight) < FixedMul(30*FRACUNIT, player->mo->scale))