diff --git a/tools/resmap/mastermap.py b/tools/resmap/mastermap.py
index 10ba4bdea..57d12898c 100755
--- a/tools/resmap/mastermap.py
+++ b/tools/resmap/mastermap.py
@@ -12,6 +12,9 @@ def process (res):
 	if len(line) == 0:
             continue
         mapline = stridgen.makeid(line)
+        # Remap not to .lst files but to .ls2 ones.
+        if line.endswith('lst'):
+            line = os.path.splitext(line)[0]+'.ls2'
         if mapline is None:
             toadd = "# NO MATCH FOR %s" % line
         else:
@@ -37,7 +40,13 @@ if __name__ == "__main__":
         d = sys.argv[1]
     resources = get_resources(d)
     resmap = process(resources)
+    keys = []
     for r in resmap:
+        key = r.split(':')[0]
+        if key in keys:
+            print "# ERROR: DUPLICATE KEY %s" % key
+        else:
+            keys.append(key)
         print r
 
     
diff --git a/tools/resmap/stridgen.py b/tools/resmap/stridgen.py
index 371280794..2f11a6e7e 100644
--- a/tools/resmap/stridgen.py
+++ b/tools/resmap/stridgen.py
@@ -31,11 +31,13 @@ patterns = [("comm/(.*)/(.*)\.mod", lambda m: "comm.%s.music" % m.group(1)),
             ("lbm/(.*)\.mod", lambda m: "music.%s" % m.group(1)),
             ("lbm/(.*)\.ct", lambda m: "colortable.%s" % m.group(1)),
             ("lbm/(.*)\.fon", lambda m: "font.%s" % m.group(1)),
+            ("lbm/(.*)snd\.snd", lambda m: "sounds.%s" % m.group(1)),
             ("lbm/(.*)\.txt", lambda m: "text.%s" % m.group(1)),
             ("lbm/mainmenu\.ogg", lambda m: "music.mainmenu"),
             ("melee/melemenu\.ogg", lambda m: "music.meleemenu"),
             ("melee/(.*)\.ani", lambda m: "graphics.%s" % m.group(1)),
             ("slides/ending/sis_skel.ani", lambda m: "graphics.sisskeleton"),
+            ("shofixti/oldcap.ani", lambda m: "ship.shofixti.graphics.oldcaptain"),
             ("(.*)/(.*)micon\.ani", lambda m: "ship.%s.meleeicons" % m.group(1)),
             ("(.*)/(.*)icons\.ani", lambda m: "ship.%s.icons" % m.group(1)),
             ("(.*)/(.*)\.cod", lambda m: "ship.%s.code" % m.group(1)),