diff --git a/res/attract-mode.txt b/res/attract-mode.txt
index 067ba4dd8..9b9901df0 100644
--- a/res/attract-mode.txt
+++ b/res/attract-mode.txt
@@ -64,7 +64,6 @@ Mr. Cool
 Nibbler
 O'Riley's Mine
 Pac-Man
-Pie-Man
 Ribbit
 Robotron 2084
 Serpentine
@@ -87,6 +86,7 @@ Dino Eggs
 Jungle Hunt
 Lode Runner
 Pest Patrol
+Pie-Man
 Pitfall II
 Plasmania
 Pooyan
diff --git a/res/attract.conf b/res/attract.conf
index b7fc2c306..55b1adeaa 100644
--- a/res/attract.conf
+++ b/res/attract.conf
@@ -1 +1 @@
-#
# Mega-Attract-Mode configuration file
#
# Mega-Attract-Mode is split into modules. Each module can be a
# short slideshow or a self-running demo (like a game's built-in
# 'attract mode'). Modules are run in the order listed here, one
# after the next, until interrupted by user input. The last-run
# module is tracked in the global prefs file.
#
# Format:
# key=value
#
# |key| must be unique within this file
#
# |value| must be one of
#   1 for HGR slideshow (|key| is a file containing a list of HGR graphics)
#   2 for DHGR slideshow (|key| is a file containing a list of DHGR graphics)
#   3 for self-running demo (|key| is an executable binary file)
#
# Blank lines and lines beginning with '#' are ignored (like this one!)
# A line beginning with '[' terminates the parsing
#

PIEMAN=3
#AGENT.USA=3
ALIEN.AMBUSH=3
ALIEN.RAIN=3
AQUATRON=3
JUNGLE.HUNT=3
POOYAN=3
SHORT.CONF=1
PLASMANIA=3
SPY.HUNTER=3
DINO.EGGS=3
BOLO=3
CHAMP.LODERUN=3
SPYS.DEMISE=3
PEST.PATROL=3
PITFALL.II=3
LODE.RUNNER=3
BURGERTIME=3
SPARE.CHANGE=3
SNEAKERS=3
WAVY.NAVY=3
DHGR.CONF=2
FAVORITES.CONF=1
EFG.CONF=1
ACTIVISION.CONF=1
CD.CONF=1
BRODERBUND.CONF=1
T.CONF=1
ATARI.CONF=1
SIERRA.CONF=1
PQR.CONF=1
DATAMOST.CONF=1
MNO.CONF=1
DATASOFT.CONF=1
S.CONF=1
MICROFUN.CONF=1
AB.CONF=1
PICCADILLY.CONF=1
HIJKL.CONF=1
SIRIUS.CONF=1

[eof]
\ No newline at end of file
+#
# Mega-Attract-Mode configuration file
#
# Mega-Attract-Mode is split into modules. Each module can be a
# short slideshow or a self-running demo (like a game's built-in
# 'attract mode'). Modules are run in the order listed here, one
# after the next, until interrupted by user input. The last-run
# module is tracked in the global prefs file.
#
# Format:
# key=value
#
# |key| must be unique within this file
#
# |value| must be one of
#   1 for HGR slideshow (|key| is a file containing a list of HGR graphics)
#   2 for DHGR slideshow (|key| is a file containing a list of DHGR graphics)
#   3 for self-running demo (|key| is an executable binary file)
#
# Blank lines and lines beginning with '#' are ignored (like this one!)
# A line beginning with '[' terminates the parsing
#

GAMMA.GOBLINS=3
#ALIEN.DOWNPOUR=3
#AGENT.USA=3
#SERPENTINE=3
#SPIDER.RAID=3
PIEMAN=3
ALIEN.AMBUSH=3
ALIEN.RAIN=3
AQUATRON=3
JUNGLE.HUNT=3
POOYAN=3
SHORT.CONF=1
PLASMANIA=3
SPY.HUNTER=3
DINO.EGGS=3
BOLO=3
CHAMP.LODERUN=3
SPYS.DEMISE=3
PEST.PATROL=3
PITFALL.II=3
LODE.RUNNER=3
BURGERTIME=3
SPARE.CHANGE=3
SNEAKERS=3
WAVY.NAVY=3
DHGR.CONF=2
FAVORITES.CONF=1
EFG.CONF=1
ACTIVISION.CONF=1
CD.CONF=1
BRODERBUND.CONF=1
T.CONF=1
ATARI.CONF=1
SIERRA.CONF=1
PQR.CONF=1
DATAMOST.CONF=1
MNO.CONF=1
DATASOFT.CONF=1
S.CONF=1
MICROFUN.CONF=1
AB.CONF=1
PICCADILLY.CONF=1
HIJKL.CONF=1
SIRIUS.CONF=1

[eof]
\ No newline at end of file
diff --git a/res/demo/GAMMA.GOBLINS b/res/demo/GAMMA.GOBLINS
new file mode 100755
index 000000000..fefbea140
Binary files /dev/null and b/res/demo/GAMMA.GOBLINS differ
diff --git a/res/demo/GAMMA.GOBLINS.1 b/res/demo/GAMMA.GOBLINS.1
new file mode 100755
index 000000000..ba43d50e1
Binary files /dev/null and b/res/demo/GAMMA.GOBLINS.1 differ
diff --git a/res/demo/_FileInformation.txt b/res/demo/_FileInformation.txt
index 9f990c977..b8bc130d8 100644
--- a/res/demo/_FileInformation.txt
+++ b/res/demo/_FileInformation.txt
@@ -19,6 +19,8 @@ CHAMP.LODERUN.1=Type(F1),AuxType(0000),Access(C3)
 CHAMP.LODERUN.Z=Type(F1),AuxType(0000),Access(C3)
 DINO.EGGS=Type(06),AuxType(0300),Access(C3)
 DINO.EGGS.1=Type(F1),AuxType(0000),Access(C3)
+GAMMA.GOBLINS=Type(06),AuxType(0300),Access(C3)
+GAMMA.GOBLINS.1=Type(F1),AuxType(0000),Access(C3)
 JUNGLE.HUNT=Type(06),AuxType(0300),Access(C3)
 JUNGLE.HUNT.1=Type(F1),AuxType(0000),Access(C3)
 JUNGLE.HUNT.A=Type(F1),AuxType(7700),Access(C3)
diff --git a/res/notes/gamma-goblins.txt b/res/notes/gamma-goblins.txt
new file mode 100644
index 000000000..9eee7ac82
--- /dev/null
+++ b/res/notes/gamma-goblins.txt
@@ -0,0 +1,6 @@
+$5B9A: 4C5F7E -> 4C0001 to exit at end of demo cycle (context is A9AD8D68514C5F7E)
+$7ECC: AD10C0 -> 4C0001 to exit when user presses a key on title screen (context is AD10C0A9D08DBC4A)
+$50CB: AD10C0 -> 4C0001 to exit during demo screen 1 (context is AD10C0A9608DD56A)
+$50B5: AD10C0 -> 4C0001 to exit during demo screen 2 (context is AD10C0A9388D006B)
+
+no buttons, no sound, hurrah