Index: applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/Win32Provider.java
===================================================================
--- applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/Win32Provider.java	(revision 31060)
+++ applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/Win32Provider.java	(revision 31061)
@@ -2,5 +2,5 @@
 package org.openstreetmap.josm.plugins.npm;
 
-import org.apache.commons.codec.binary.Base64;
+import javax.xml.bind.DatatypeConverter;
 
 import org.netbeans.modules.keyring.fallback.FallbackProvider;
@@ -14,9 +14,9 @@
         @Override public byte[] getByteArray(String key, byte[] def) {
             String p = Main.pref.get(key, null);
-            return p == null ? def : Base64.decodeBase64(p);
+            return p == null ? def : DatatypeConverter.parseBase64Binary(p);
         }
 
         @Override public void putByteArray(String key, byte[] val) {
-            Main.pref.put(key, val == null ? null : Base64.encodeBase64String(val));
+            Main.pref.put(key, val == null ? null : DatatypeConverter.printBase64Binary(val));
         }