diff --git a/ChangeLog b/ChangeLog
index e85155643..d50e9f59d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2006-05-18  Don Allingham  <don@gramps-project.org>
 	* src/GrampsDb/_ReadGedcom.py: fix parsing level so that CHAR is not 
 	skipped
+	* src/DisplayTabs/_AddrEmbedList.py: fix city/state mapping (romjerome)
 	* src/glade/gramps.glade: fix media ref dialog with warn box
 	* src/Filters/_PersonSidebarFilter.py (PersonSidebarFilter.clear): 
 	fix clearing of combobox
diff --git a/src/DisplayTabs/_AddrEmbedList.py b/src/DisplayTabs/_AddrEmbedList.py
index 8b7e648c1..ea025ea96 100644
--- a/src/DisplayTabs/_AddrEmbedList.py
+++ b/src/DisplayTabs/_AddrEmbedList.py
@@ -51,8 +51,8 @@ class AddrEmbedList(EmbeddedList):
     _column_names = [
         (_('Date'),    0, 150), 
         (_('Street'),  1, 225), 
-        (_('State'),   2, 100), 
-        (_('City'),    3, 100), 
+        (_('City'),    2, 100), 
+        (_('State'),   3, 100), 
         (_('Country'), 4, 75), 
         ]