Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 6699)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 6700)
@@ -27,4 +27,5 @@
 import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
+import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -332,11 +333,10 @@
         private void performTagEdit() {
             String value = Tag.removeWhiteSpaces(values.getEditor().getItem().toString());
-            // is not Java 1.5
-            //value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
+            value = Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
             if (value.isEmpty()) {
                 value = null; // delete the key
             }
             String newkey = Tag.removeWhiteSpaces(keys.getEditor().getItem().toString());
-            //newkey = java.text.Normalizer.normalize(newkey, java.text.Normalizer.Form.NFC);
+            newkey = Normalizer.normalize(newkey, java.text.Normalizer.Form.NFC);
             if (newkey.isEmpty()) {
                 newkey = key;