diff --git a/res/attract.conf b/res/attract.conf
index 28a40e5e4..1e8b9e6d0 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
#

SNAKE.BYTE=3
HIGH.RISE=3
THUNDERBOMBS=3
ROBOTRON=3
NIBBLER=3
LADY.TUT=3
STARGATE=3
#SPIDER.RAID=3
FLIP.OUT=3
#STELLAR.7=3
#TRACK.AND.FIELD=3
AGENT.USA=3
GUMBALL=3
TUBEWAY=3
CIDER.SPIDER=3
CONAN=3
MR.COOL=3
CHOPLIFTER=3
HARD.HAT.MACK=3
PACMAN=3
SERPENTINE=3
KARATEKA=3
WARP.DESTROYER=3
LOST.TOMB=3
VINDICATOR=3
REPTON=3
SAMMY.LIGHTFOOT=3
DUNG.BEETLES=3
GAMMA.GOBLINS=3
#ALIEN.DOWNPOUR=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
+#
# 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
#

BUZZARD.BAIT=3
SNAKE.BYTE=3
HIGH.RISE=3
THUNDERBOMBS=3
ROBOTRON=3
NIBBLER=3
LADY.TUT=3
STARGATE=3
#SPIDER.RAID=3
FLIP.OUT=3
#STELLAR.7=3
#TRACK.AND.FIELD=3
AGENT.USA=3
GUMBALL=3
TUBEWAY=3
CIDER.SPIDER=3
CONAN=3
MR.COOL=3
CHOPLIFTER=3
HARD.HAT.MACK=3
PACMAN=3
SERPENTINE=3
KARATEKA=3
WARP.DESTROYER=3
LOST.TOMB=3
VINDICATOR=3
REPTON=3
SAMMY.LIGHTFOOT=3
DUNG.BEETLES=3
GAMMA.GOBLINS=3
#ALIEN.DOWNPOUR=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/BUZZARD.BAIT b/res/demo/BUZZARD.BAIT
new file mode 100755
index 000000000..0b1e7977f
Binary files /dev/null and b/res/demo/BUZZARD.BAIT differ
diff --git a/res/demo/BUZZARD.BAIT.1 b/res/demo/BUZZARD.BAIT.1
new file mode 100755
index 000000000..2d162e6cd
Binary files /dev/null and b/res/demo/BUZZARD.BAIT.1 differ
diff --git a/res/demo/_FileInformation.txt b/res/demo/_FileInformation.txt
index e30593bb1..8013438df 100644
--- a/res/demo/_FileInformation.txt
+++ b/res/demo/_FileInformation.txt
@@ -14,6 +14,8 @@ BURGERTIME.2=Type(F1),AuxType(6400),Access(C3)
 BURGERTIME.3=Type(F1),AuxType(2000),Access(C3)
 BURGERTIME.4=Type(F1),AuxType(0C00),Access(C3)
 BURGERTIME.5=Type(F1),AuxType(6000),Access(C3)
+BUZZARD.BAIT=Type(06),AuxType(0300),Access(C3)
+BUZZARD.BAIT.1=Type(F1),AuxType(0000),Access(C3)
 CHAMP.LODERUN=Type(06),AuxType(0800),Access(C3)
 CHAMP.LODERUN.1=Type(F1),AuxType(0000),Access(C3)
 CHAMP.LODERUN.Z=Type(F1),AuxType(0000),Access(C3)
diff --git a/res/notes/buzzard-bait.txt b/res/notes/buzzard-bait.txt
new file mode 100644
index 000000000..1dc9a8507
--- /dev/null
+++ b/res/notes/buzzard-bait.txt
@@ -0,0 +1,4 @@
+$1067: 4C1B90 -> 4C0001 to exit on keypress or button press (context is 20F51E4C6B104C1B90)
+$1B31: C9E090 -> 4C0001 to exit on keypress (context is AD00C01006C9E0900229DF60)
+$7A6B: 4C1B90 -> 4C0001 to exit on button press (context is AD61C04DB60910034C1B90)
+$80DD: 20EF15 -> 4C0001 to exit at end of demo cycle (context is 20EF152003904C1380)