diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index 03c2fc82d222cdc9e7deee323a082c6af87c5c3c..0fe11cf5eeb730027af6d9fa2ccbfbc19c08b4bb 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -4370,6 +4370,10 @@ udmf
 			sprite = "STPTA0M0";
 			width = 64;
 			height = 128;
+			arg0
+			{
+				title = "Order";
+			}
 		}
 		520
 		{
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 7f12a190b8e35b8e258a46735ab5900f20feadd6..f6954baeff72e38df600a1af73bbf4a69579d4c8 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12966,15 +12966,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 		mobj_t* mo2;
 		boolean foundanother = false;
 
-		if (mthing->extrainfo)
-			// Allow thing Parameter to define star post num too!
-			// For starposts above param 15 (the 16th), add 360 to the angle like before and start parameter from 1 (NOT 0)!
-			// So the 16th starpost is angle=0 param=15, the 17th would be angle=360 param=1.
-			// This seems more intuitive for mappers to use until UDMF is ready, since most SP maps won't have over 16 consecutive star posts.
-			mobj->health = mthing->extrainfo + (mthing->angle/360)*15 + 1;
-		else
-			// Old behavior if Parameter is 0; add 360 to the angle for each consecutive star post.
-			mobj->health = (mthing->angle/360) + 1;
+		mobj->health = mthing->args[0] + 1;
 
 		// See if other starposts exist in this level that have the same value.
 		for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
diff --git a/src/p_setup.c b/src/p_setup.c
index bf12c88bcbd25ca919025035c20fd5b57f488a49..1761a4be9379c460126b44b52457d9750cbead51 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -4890,6 +4890,17 @@ static void P_ConvertBinaryMap(void)
 		case 111: //Pop-up Turret
 			mapthings[i].args[0] = mapthings[i].angle;
 			break;
+		case 502: //Star post
+			if (mapthings[i].extrainfo)
+				// Allow thing Parameter to define star post num too!
+				// For starposts above param 15 (the 16th), add 360 to the angle like before and start parameter from 1 (NOT 0)!
+				// So the 16th starpost is angle=0 param=15, the 17th would be angle=360 param=1.
+				// This seems more intuitive for mappers to use, since most SP maps won't have over 16 consecutive star posts.
+				mapthings[i].args[0] = mapthings[i].extrainfo + (mapthings[i].angle/360) * 15;
+			else
+				// Old behavior if Parameter is 0; add 360 to the angle for each consecutive star post.
+				mapthings[i].args[0] = (mapthings[i].angle/360);
+			break;
 		case 753: //Zoom tube waypoint
 			mapthings[i].args[0] = mapthings[i].angle >> 8;
 			mapthings[i].args[1] = mapthings[i].angle & 255;