diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index 328cf7673..9d557060e 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -7030,6 +7030,10 @@ udmf
 				type = 11;
 				enum = "pushablebehavior";
 			}
+			arg1
+			{
+				title = "Starting delay";
+			}
 		}
 		1501
 		{
@@ -7045,6 +7049,10 @@ udmf
 				type = 11;
 				enum = "pushablebehavior";
 			}
+			arg1
+			{
+				title = "Starting delay";
+			}
 		}
 		1502
 		{
@@ -7060,6 +7068,10 @@ udmf
 				type = 11;
 				enum = "pushablebehavior";
 			}
+			arg1
+			{
+				title = "Starting delay";
+			}
 		}
 		1503
 		{
@@ -7075,6 +7087,10 @@ udmf
 				type = 11;
 				enum = "pushablebehavior";
 			}
+			arg1
+			{
+				title = "Starting delay";
+			}
 		}
 		1504
 		{
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 3de85fa2b..5a8645708 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12884,8 +12884,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 	case MT_GLAREGOYLEUP:
 	case MT_GLAREGOYLEDOWN:
 	case MT_GLAREGOYLELONG:
-		if (mthing->angle >= 360)
-			mobj->tics += 7*(mthing->angle/360) + 1; // starting delay
+		mobj->tics += mthing->args[1]; // starting delay
 		break;
 	case MT_DSZSTALAGMITE:
 	case MT_DSZ2STALAGMITE:
diff --git a/src/p_setup.c b/src/p_setup.c
index 1a063bc2c..e0c805a4b 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -5358,6 +5358,13 @@ static void P_ConvertBinaryMap(void)
 		case 1305: //Rollout Rock
 			mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH);
 			break;
+		case 1500: //Glaregoyle
+		case 1501: //Glaregoyle (Up)
+		case 1502: //Glaregoyle (Down)
+		case 1503: //Glaregoyle (Long)
+			if (mapthings[i].angle >= 360)
+				mapthings[i].args[1] = 7*(mapthings[i].angle/360) + 1;
+			break;
 		case 1700: //Axis
 			mapthings[i].args[2] = mapthings[i].angle & 16383;
 			mapthings[i].args[3] = !!(mapthings[i].angle & 16384);