diff --git a/CHANGELOG b/CHANGELOG
index f4317798b8..3f92b2ce88 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Create a zip entry for each subdivision found
+
 Version 5.4.0 - 2019-11-04
 * Bug fixes (see mercurial logs for details)
 * Replace XML data by import script
diff --git a/scripts/import_zip.py b/scripts/import_zip.py
index 25bbfc7c88..7ba2c5d3e7 100755
--- a/scripts/import_zip.py
+++ b/scripts/import_zip.py
@@ -81,10 +81,12 @@ def import_(data):
     for row in pbar(list(csv.DictReader(
                     f, fieldnames=_fieldnames, delimiter='\t'))):
         country = get_country(row['country'])
-        subdivision = get_subdivision(row['country'], row['code1'])
-        zips.append(
-            Zip(country=country, subdivision=subdivision, zip=row['postal'],
-            city=row['place']))
+        for code in ['code1', 'code2', 'code3']:
+            subdivision = get_subdivision(row['country'], row[code])
+            if code == 'code1' or subdivision:
+                zips.append(
+                    Zip(country=country, subdivision=subdivision,
+                        zip=row['postal'], city=row['place']))
     Zip.save(zips)