Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml	(revision 33903)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml	(revision 33904)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Initial version."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12859"/>
+    <property name="plugin.main.version" value="13007"/>
     <!-- Configure these properties (replace "..." accordingly).
          See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java	(revision 33903)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java	(revision 33904)
@@ -18,5 +18,5 @@
     public HouseNumberTaggingToolPlugin(PluginInformation info) {
         super(info);
-        action = new LaunchAction(getPluginDir());
+        action = new LaunchAction(getPluginDirs().getUserDataDirectory(false));
         MainMenu.add(MainApplication.getMenu().dataMenu, action, false,0);
     }
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java	(revision 33903)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java	(revision 33904)
@@ -3,4 +3,5 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.io.File;
 import java.util.Collection;
 
@@ -15,5 +16,5 @@
     private OsmPrimitive selection = null;
 
-    private String pluginDir;
+    private File pluginDir;
 
     /**
@@ -21,5 +22,5 @@
      * @param pluginDir plugin directory
      */
-    public LaunchAction(String pluginDir) {
+    public LaunchAction(File pluginDir) {
         super("HouseNumberTaggingTool", 
               "home-icon32", 
Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java	(revision 33903)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java	(revision 33904)
@@ -73,5 +73,5 @@
     private static final Logger LOGGER = Logger.getLogger(TagDialog.class.getName());
 
-    private String pluginDir;
+    private File pluginDir;
     private AutoCompletionManager acm;
     private OsmPrimitive selection;
@@ -102,5 +102,5 @@
      * @param selection selected primitive
      */
-    public TagDialog(String pluginDir, OsmPrimitive selection) {
+    public TagDialog(File pluginDir, OsmPrimitive selection) {
         super(Main.parent, tr("House Number Editor"), new String[] { tr("OK"), tr("Cancel") }, true);
         this.pluginDir = pluginDir;
@@ -404,5 +404,5 @@
 
     protected void saveDto(Dto dto) {
-        File path = new File(pluginDir);
+        File path = pluginDir;
         File fileName = new File(pluginDir + TagDialog.TEMPLATE_DATA);