diff --git a/BaseClasses.py b/BaseClasses.py
index 01752a0b..1b2322f8 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1074,6 +1074,8 @@ class Spoiler(object):
                          'enemy_shuffle': self.world.enemy_shuffle,
                          'enemy_health': self.world.enemy_health,
                          'enemy_damage': self.world.enemy_damage,
+                         'beemizer': self.world.beemizer,
+                         'shufflepots': self.world.shufflepots,
                          'players': self.world.players,
                          'teams': self.world.teams
                          }
@@ -1129,6 +1131,8 @@ class Spoiler(object):
                 outfile.write('Enemy health:                    %s\n' % self.metadata['enemy_health'][player])
                 outfile.write('Enemy damage:                    %s\n' % self.metadata['enemy_damage'][player])
                 outfile.write('Hints:                           %s\n' % ('Yes' if self.metadata['hints'][player] else 'No'))
+                outfile.write('Beemizer:                        %s\n' % self.metadata['beemizer'][player])
+                outfile.write('Pot shuffle                      %s\n' % ('Yes' if self.metadata['shufflepots'][player] else 'No'))
             if self.entrances:
                 outfile.write('\n\nEntrances:\n\n')
                 outfile.write('\n'.join(['%s%s %s %s' % (f'{self.world.get_player_names(entry["player"])}: ' if self.world.players > 1 else '', entry['entrance'], '<=>' if entry['direction'] == 'both' else '<=' if entry['direction'] == 'exit' else '=>', entry['exit']) for entry in self.entrances.values()]))
diff --git a/Main.py b/Main.py
index 62dc62a2..9759dbab 100644
--- a/Main.py
+++ b/Main.py
@@ -52,6 +52,7 @@ def main(args, seed=None):
     world.enemy_health = args.enemy_health.copy()
     world.enemy_damage = args.enemy_damage.copy()
     world.beemizer = args.beemizer.copy()
+    world.shufflepots = args.shufflepots.copy()
 
     world.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)}
 
@@ -265,6 +266,7 @@ def copy_world(world):
     ret.enemy_health = world.enemy_health.copy()
     ret.enemy_damage = world.enemy_damage.copy()
     ret.beemizer = world.beemizer.copy()
+    ret.shufflepots = world.shufflepots.copy()
 
     for player in range(1, world.players + 1):
         if world.mode[player] != 'inverted':