diff --git a/base_location/migrations/12.0.1.0.0/post-migration.py b/base_location/migrations/12.0.1.0.0/post-migration.py
new file mode 100644
index 000000000..3f8ba212a
--- /dev/null
+++ b/base_location/migrations/12.0.1.0.0/post-migration.py
@@ -0,0 +1,35 @@
+# Copyright 2018 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from psycopg2.extensions import AsIs
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    column_name = openupgrade.get_legacy_name('better_zip_id')
+    openupgrade.logged_query(
+        "ALTER TABLE res_city_zip ADD %s INTEGER", (AsIs(column_name), ),
+    )
+    openupgrade.logged_query(
+        env.cr, """
+        INSERT INTO res_city_zip (
+            %s, name, city_id
+        )
+        SELECT
+            id, name, city_id
+        FROM res_better_zip
+        WHERE city_id IS NOT NULL""",
+        (AsIs(column_name), ),
+    )
+    # Recompute display name for entries inserted by SQL
+    env['res.city.zip'].search([])._compute_new_display_name()
+    # Link res.partner with corresponding new entries
+    openupgrade.logged_query(
+        env.cr, """
+        UPDATE res_partner rp
+        SET zip_id = rcz.id
+        FROM res_city_zip rcz
+        WHERE rcz.%s = rp.%s""",
+        (AsIs(column_name), AsIs(openupgrade.get_legacy_name('zip_id')), ),
+    )
diff --git a/base_location/migrations/12.0.1.0.0/pre-migration.py b/base_location/migrations/12.0.1.0.0/pre-migration.py
new file mode 100644
index 000000000..f9a069612
--- /dev/null
+++ b/base_location/migrations/12.0.1.0.0/pre-migration.py
@@ -0,0 +1,15 @@
+# Copyright 2018 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.rename_columns(
+        env.cr, {
+            'res_partner': [
+                ('zip_id', None),
+            ]
+        }
+    )