diff --git a/db/manifest b/db/manifest
index f10027f6e..fdd6e190c 100755
--- a/db/manifest
+++ b/db/manifest
@@ -160,3 +160,4 @@ periodic_emails.sql
 remember_extra_scoring_data.sql
 indexing_for_regions.sql
 latency_tester.sql
+fix_users_location_fields.sql
diff --git a/db/up/fix_users_location_fields.sql b/db/up/fix_users_location_fields.sql
new file mode 100644
index 000000000..04c822a5c
--- /dev/null
+++ b/db/up/fix_users_location_fields.sql
@@ -0,0 +1,5 @@
+ALTER TABLE users DROP COLUMN addr;
+ALTER TABLE users DROP COLUMN locidispid;
+ALTER TABLE users DROP COLUMN internet_service_provider;
+ALTER TABLE users ADD COLUMN statecode varchar(2);
+ALTER TABLE users ADD COLUMN countrycode varchar(2);