diff --git a/eddb.py b/eddb.py
index 6b626031..0e55a1fe 100755
--- a/eddb.py
+++ b/eddb.py
@@ -44,6 +44,10 @@ class EDDB:
 if __name__ == "__main__":
     import json
 
+    # still send market and outfitting for currently "suspended" stations -
+    # https://community.elitedangerous.com/galnet/uid/568a999f9657ba5e0986a8de
+    suspended = set([659, 39328, 5672, 30402, 30653, 21901, 11335])
+
     # system_name by system_id
     systems  = dict([(x['id'], str(x['name'])) for x in json.loads(open('systems.json').read())])
 
@@ -59,6 +63,12 @@ if __name__ == "__main__":
     cPickle.dump(system_ids,  open('systems.p',  'wb'), protocol = cPickle.HIGHEST_PROTOCOL)
 
     # station_id by (system_id, station_name)
-    station_ids = dict([((x['system_id'], str(x['name'])), (x['id'], (EDDB.HAS_MARKET if x['has_market'] else 0) | (EDDB.HAS_OUTFITTING if x['has_outfitting'] else 0) | (EDDB.HAS_SHIPYARD if x['has_shipyard'] else 0))) for x in stations])
+    station_ids = dict([(
+        (x['system_id'], str(x['name'])),
+        (x['id'],
+         (EDDB.HAS_MARKET     if x['has_market']     or x['is_planetary'] or x['id'] in suspended else 0) |
+         (EDDB.HAS_OUTFITTING if x['has_outfitting'] or x['is_planetary'] or x['id'] in suspended else 0) |
+         (EDDB.HAS_SHIPYARD   if x['has_shipyard']   else 0)))
+                        for x in stations])
     cPickle.dump(station_ids, open('stations.p', 'wb'), protocol = cPickle.HIGHEST_PROTOCOL)
 
diff --git a/stations.p b/stations.p
index 13d45478..1053831d 100644
Binary files a/stations.p and b/stations.p differ
diff --git a/systems.p b/systems.p
index e4faeec5..fd79911c 100644
Binary files a/systems.p and b/systems.p differ