diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index cf6b8a875a3aac75cdd3fe5fd53f2b9c94ea7d90..303bfe396957ceb438b6abfa3cecf0776e7ce8ac 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -3635,6 +3635,10 @@ udmf
 			sprite = "TURRI1";
 			width = 12;
 			height = 64;
+			arg0
+			{
+				title = "Firing delay";
+			}
 		}
 		122
 		{
diff --git a/src/p_mobj.c b/src/p_mobj.c
index c673f39711773b93a18a4232bb8859adc704aaba..a3e7f8f96273e07bda90830aab3702de24743aa9 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12806,10 +12806,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 			return false;
 		break;
 	case MT_POPUPTURRET:
-		if (mthing->angle)
-			mobj->threshold = mthing->angle;
-		else
-			mobj->threshold = (TICRATE*2)-1;
+		mobj->threshold = mthing->args[0] ? mthing->args[0] : (TICRATE*2)-1;
 		break;
 	case MT_NIGHTSBUMPER:
 		// Pitch of the bumper is set in 30 degree increments.
diff --git a/src/p_setup.c b/src/p_setup.c
index ee29d6e1076a2508dc2d971c1a37a772122f326c..e04de6e55dc52412780ccc17438d1ca2d40a4962 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -4886,6 +4886,9 @@ static void P_ConvertBinaryMap(void)
 		case 110: //THZ Turret
 			mapthings[i].args[0] = LE_TURRET;
 			break;
+		case 111: //Pop-up Turret
+			mapthings[i].args[0] = mapthings[i].angle;
+			break;
 		case 754: //Push point
 		case 755: //Pull point
 		{