diff --git a/src/actionspecials.h b/src/actionspecials.h
index aac1b7161..233bb8958 100644
--- a/src/actionspecials.h
+++ b/src/actionspecials.h
@@ -47,7 +47,7 @@ DEFINE_SPECIAL(Ceiling_CrushRaiseAndStay, 45, 3, 4, 4)
 DEFINE_SPECIAL(Floor_CrushStop, 46, 1, 1, 1)
 DEFINE_SPECIAL(Ceiling_MoveToValue, 47, 3, 5, 5)
 DEFINE_SPECIAL(Sector_Attach3dMidtex, 48, -1, -1, 3)
-DEFINE_SPECIAL(GlassBreak, 49, 0, 1, 1)
+DEFINE_SPECIAL(GlassBreak, 49, 0, 1, 2)
 DEFINE_SPECIAL(ExtraFloor_LightOnly, 50, -1, -1, 2)
 DEFINE_SPECIAL(Sector_SetLink, 51, 4, 4, 4)
 DEFINE_SPECIAL(Scroll_Wall, 52, 5, 5, 5)
diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp
index 394203c75..ee70dcee5 100644
--- a/src/p_lnspec.cpp
+++ b/src/p_lnspec.cpp
@@ -3177,7 +3177,7 @@ FUNC(LS_ClearForceField)
 }
 
 FUNC(LS_GlassBreak)
-// GlassBreak (bNoJunk)
+// GlassBreak (bNoJunk, junkID)
 {
 	bool switched;
 	bool quest1, quest2;
@@ -3197,7 +3197,6 @@ FUNC(LS_GlassBreak)
 	{
 		if (!arg0)
 		{ // Break some glass
-			AActor *glass;
 
 			DVector2 linemid((ln->v1->fX() + ln->v2->fX()) / 2, (ln->v1->fY() + ln->v2->fY()) / 2);
 
@@ -3209,18 +3208,32 @@ FUNC(LS_GlassBreak)
 			y += (ln->frontsector->centerspot.y - y) / 5;
 			*/
 
+			auto type = SpawnableThings.CheckKey(arg1);
 			for (int i = 0; i < 7; ++i)
 			{
-				glass = Spawn("GlassJunk", DVector3(linemid, ONFLOORZ), ALLOW_REPLACE);
-
-				glass->AddZ(24.);
-				glass->SetState (glass->SpawnState + (pr_glass() % glass->health));
-
-				glass->Angles.Yaw = pr_glass() * (360 / 256.);
-				glass->VelFromAngle(pr_glass() & 3);
-				glass->Vel.Z = (pr_glass() & 7);
-				// [RH] Let the shards stick around longer than they did in Strife.
-				glass->tics += pr_glass();
+				AActor *glass = nullptr;
+				if (arg1 > 0)
+				{
+					if (type != nullptr)
+					{
+						glass = Spawn(*type, DVector3(linemid, ONFLOORZ), ALLOW_REPLACE);
+						glass->AddZ(24.);
+					}
+				}
+				else
+				{
+					glass = Spawn("GlassJunk", DVector3(linemid, ONFLOORZ), ALLOW_REPLACE);
+					glass->AddZ(24.);
+					glass->SetState(glass->SpawnState + (pr_glass() % glass->health));
+				}
+				if (glass != nullptr)
+				{
+					glass->Angles.Yaw = pr_glass() * (360 / 256.);
+					glass->VelFromAngle(pr_glass() & 3);
+					glass->Vel.Z = (pr_glass() & 7);
+					// [RH] Let the shards stick around longer than they did in Strife.
+					glass->tics += pr_glass();
+				}
 			}
 		}
 		if (quest1 || quest2)