diff --git a/src/deh_tables.c b/src/deh_tables.c
index 16134fe68..07c69f687 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -4557,6 +4557,8 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
 	"S_SPECIAL_UFO_OVERLAY",
 	"S_SPECIAL_UFO_ARM",
 	"S_SPECIAL_UFO_STEM",
+
+	"S_GACHABOM",
 };
 
 // RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
diff --git a/src/info.c b/src/info.c
index 037fcc535..2c22b4bf4 100644
--- a/src/info.c
+++ b/src/info.c
@@ -795,6 +795,8 @@ char sprnames[NUMSPRITES + 1][5] =
 
 	"UQMK",
 
+	"GBOM",
+
 	// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
 	"VIEW",
 };
@@ -5180,6 +5182,8 @@ state_t states[NUMSTATES] =
 	{SPR_UFOB, 1|FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 1, 1, S_NULL}, // S_SPECIAL_UFO_OVERLAY
 	{SPR_UFOA, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_SPECIAL_UFO_ARM
 	{SPR_UFOS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SPECIAL_UFO_STEM
+
+	{SPR_GBOM, FF_ANIMATE, -1, {NULL}, 3, 1, S_NULL}, // S_GACHABOM
 };
 
 mobjinfo_t mobjinfo[NUMMOBJTYPES] =
@@ -24364,7 +24368,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 
 	{           // MT_GACHABOM
 		-1,             // doomednum
-		S_ORBINAUT1,    // spawnstate
+		S_GACHABOM,     // spawnstate
 		7,              // spawnhealth
 		S_NULL,         // seestate
 		sfx_tossed,     // seesound
@@ -24375,7 +24379,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		sfx_None,       // painsound
 		S_NULL,         // meleestate
 		S_NULL,         // missilestate
-		S_ORBINAUT_DEAD,// deathstate
+		S_GACHABOM,     // deathstate
 		S_NULL,         // xdeathstate
 		sfx_s3k5d,      // deathsound
 		64*FRACUNIT,    // speed
diff --git a/src/info.h b/src/info.h
index f4771bd9c..1bac859b1 100644
--- a/src/info.h
+++ b/src/info.h
@@ -1346,6 +1346,8 @@ typedef enum sprite
 
 	SPR_UQMK,
 
+	SPR_GBOM,
+
 	// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
 	SPR_VIEW,
 
@@ -5607,6 +5609,8 @@ typedef enum state
 	S_SPECIAL_UFO_ARM,
 	S_SPECIAL_UFO_STEM,
 
+	S_GACHABOM,
+
 	S_FIRSTFREESLOT,
 	S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
 	NUMSTATES