--- a/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Wed Jul 06 18:27:46 2011 +0200
+++ b/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Wed Jul 06 18:38:40 2011 +0200
@@ -50,8 +50,22 @@
     }
 
     public MapScriptWriter(String templ, String filename) {
+	String path = System.getProperty("user.dir");
         map = new mapObj(templ);
-        mapFilename = filename;
+	File f = new File(filename);
+	mapFilename = filename;
+	if(f.isAbsolute()) {
+            map.setMappath(mapFilename);
+	}
+	else {
+	    map.setMappath(
+	        System.getProperty("user.dir") +
+	       	File.separator +
+		mapFilename);
+	    mapFilename = System.getProperty("user.dir") +
+	       	File.separator +
+		mapFilename;
+	}	
     }
 
     /**
@@ -75,8 +89,9 @@
         writeLayer();
         //Save the map.
         mapObj cloneMap = map.cloneMap();
-        cloneMap.save(mapFilename);
-        logger.info("Mapfile successfully created.");
+
+	cloneMap.save(mapFilename);
+        logger.info("Mapfile created: " + mapFilename);
         return true;
     }