diff --git a/coriolis-data b/coriolis-data
index c78d7d49..f7c11036 160000
--- a/coriolis-data
+++ b/coriolis-data
@@ -1 +1 @@
-Subproject commit c78d7d49f019862e3064afcbfdcb20feee3ad518
+Subproject commit f7c1103650d8c63a7781284b03f3885a79e1fe2b
diff --git a/coriolis.py b/coriolis.py
index a2fe07f0..542a686e 100755
--- a/coriolis.py
+++ b/coriolis.py
@@ -74,6 +74,7 @@ fixup_map.update({ x[0] : ('Scanner', x[0]) for x in outfitting.misc_internal_ma
 fixup_map.update({ x[0] : ('Countermeasure', x[0]) for x in outfitting.countermeasure_map.values() })
 fixup_map.update({
     'Advanced Plasma Accelerator'   : ('Plasma Accelerator', 'Advanced Plasma Accelerator'),
+    'Corrosion Resistant Cargo Rack': ('Cargo Rack', 'Corrosion Resistant'),
     'Cytoscrambler Burst Laser'     : ('Burst Laser', 'Cytoscrambler'),
     'Enforcer Cannon'               : ('Multi-cannon', 'Enforcer'),
     'Enhanced Performance Thrusters': ('Thrusters', 'Enhanced Performance'),
@@ -328,7 +329,14 @@ if __name__ == "__main__":
                 else:
                     modules[key] = { 'mass': m.get('mass', 0) }	# Some modules don't have mass
 
-    modules[('Planetary Approach Suite', None, '1', 'I')] = { 'mass': 0 }	# not in data at time of writing
+    # not in coriolis-data at time of writing - stop outfitting complaining about them in debug mode
+    for module in [
+            ('Planetary Approach Suite', None, '1', 'I'),
+            ('Corrosion Resistant Cargo Rack', None, '1', 'D'),
+            ('Corrosion Resistant Cargo Rack', None, '2', 'D'),
+    ]:
+        if not module in modules:
+            modules[module] = { 'mass': 0 }
 
     cPickle.dump(modules, open('modules.p', 'wb'), protocol = cPickle.HIGHEST_PROTOCOL)
 
diff --git a/loadout.py b/loadout.py
index 7c07791b..6bd79774 100644
--- a/loadout.py
+++ b/loadout.py
@@ -71,7 +71,7 @@ def export(data, filename=None):
             mass += module.get('mass', 0)
 
             # Specials
-            if module['name'] in ['Fuel Tank', 'Cargo Rack']:
+            if 'Fuel Tank'in module['name'] or 'Cargo Rack' in module['name']:
                 name = '%s (Capacity: %d)' % (module['name'], 2**int(module['class']))
             else:
                 name = module['name']
diff --git a/modules.p b/modules.p
index 817f047e..eba082e2 100644
Binary files a/modules.p and b/modules.p differ
diff --git a/outfitting.py b/outfitting.py
index fcd77fc9..2bba9f34 100644
--- a/outfitting.py
+++ b/outfitting.py
@@ -206,6 +206,7 @@ internal_map = {
     'buggybay'          : 'Planetary Vehicle Hangar',
     'cargorack'         : 'Cargo Rack',
     'collection'        : 'Collector Limpet Controller',
+    'corrosionproofcargorack' : 'Corrosion Resistant Cargo Rack',
     'fsdinterdictor'    : 'Frame Shift Drive Interdictor',
     'fuelscoop'         : 'Fuel Scoop',
     'fueltransfer'      : 'Fuel Transfer Limpet Controller',