Index: trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java	(revision 3882)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java	(revision 3883)
@@ -12,5 +12,8 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.BorderFactory;
@@ -29,4 +32,5 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
+import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetMenu;
@@ -300,4 +304,30 @@
 
         @Override
+        public List<SourceEntry> get() {
+            List<SourceEntry> ls = new ArrayList<SourceEntry>(super.get());
+            if (removeDeprecated(ls)) {
+                put(ls);
+            }
+            return ls;
+        }
+
+        /**
+         * The internal path of elemstyles.xml has changed, this
+         * can be removed when a few months have passed.
+         */
+        private boolean removeDeprecated(List<SourceEntry> ls) {
+            boolean changed = false;
+            Iterator<SourceEntry> it = ls.iterator();
+            while (it.hasNext()) {
+                SourceEntry se = it.next();
+                if (se.url.equals("resource://data/elemstyles.xml")) {
+                    it.remove();
+                    changed = true;
+                }
+            }
+            return changed;
+        }
+
+        @Override
         public Collection<ExtendedSourceEntry> getDefault() {
             ExtendedSourceEntry i = new ExtendedSourceEntry("defaultpresets.xml", "resource://data/defaultpresets.xml");