diff --git a/EntranceRandomizer.py b/EntranceRandomizer.py
index 937bfb2d..259d3002 100755
--- a/EntranceRandomizer.py
+++ b/EntranceRandomizer.py
@@ -218,6 +218,7 @@ def start():
     parser.add_argument('--securerandom', default=False, action='store_true')
 
     parser.add_argument('--outputpath')
+    parser.add_argument('--outputname')
     args = parser.parse_args()
 
     if args.outputpath and os.path.isdir(args.outputpath):
diff --git a/Main.py b/Main.py
index e98955e1..c0ef207a 100644
--- a/Main.py
+++ b/Main.py
@@ -102,7 +102,10 @@ def main(args, seed=None):
     else:
         sprite = None
 
-    outfilebase = 'ER_%s_%s-%s-%s-%s%s_%s%s%s%s%s_%s' % (world.logic, world.difficulty, world.difficulty_adjustments, world.mode, world.goal, "" if world.timer in ['none', 'display'] else "-" + world.timer, world.shuffle, "-keysanity" if world.keysanity else "", "-retro" if world.retro else "", "-prog_" + world.progressive if world.progressive in ['off', 'random'] else "", "-nohints" if not world.hints else "", world.seed)
+    if args.outputname:
+        outfilebase = 'ER_%s' % (args.outputname)
+    else:
+        outfilebase = 'ER_%s_%s-%s-%s-%s%s_%s%s%s%s%s_%s' % (world.logic, world.difficulty, world.difficulty_adjustments, world.mode, world.goal, "" if world.timer in ['none', 'display'] else "-" + world.timer, world.shuffle, "-keysanity" if world.keysanity else "", "-retro" if world.retro else "", "-prog_" + world.progressive if world.progressive in ['off', 'random'] else "", "-nohints" if not world.hints else "", world.seed)
 
     use_enemizer = args.enemizercli and (args.shufflebosses != 'none' or args.shuffleenemies or args.enemy_health != 'default' or args.enemy_health != 'default' or args.enemy_damage or args.shufflepalette or args.shufflepots)