Index: applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- applications/editors/josm/plugins/livegps/build.xml	(revision 6557)
+++ applications/editors/josm/plugins/livegps/build.xml	(revision 6709)
@@ -10,6 +10,8 @@
 
   <!-- compilation properties -->
-  <property name="josm.build.dir"	value="../../core"/>
+  <!--<property name="josm.build.dir"	value="../../JOSM/"/> -->
+  <property name="josm.build.dir"	value="../../core/"/>
   <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+  <!-- <property name="josm"			location="../../JOSM/dist/josm-custom.jar" /> -->
   <property name="josm"			location="../../core/dist/josm-custom.jar" />
   <property name="plugin.build.dir"	value="build"/>
@@ -39,5 +41,5 @@
     <copy todir="${plugin.build.dir}/images">
       <fileset dir="images" />
-    </copy>
+    </copy>  	
     
     <!-- create jar file -->
@@ -59,4 +61,5 @@
         <pathelement path="${josm.build.dir}/build"/>
         <fileset dir="${josm.build.dir}/lib">
+          <include name="/usr/lib/josm/josm.jar"/>
           <include name="**/*.jar"/>
         </fileset>
@@ -68,4 +71,5 @@
   <target name="install" depends="dist">
     <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+  	<copy file="liveGPS.conf" todir="${josm.plugins.dir}/livegps/" />
   </target>
 
Index: applications/editors/josm/plugins/livegps/liveGPS.conf
===================================================================
--- applications/editors/josm/plugins/livegps/liveGPS.conf	(revision 6709)
+++ applications/editors/josm/plugins/livegps/liveGPS.conf	(revision 6709)
@@ -0,0 +1,2 @@
+host=localhost
+port=2947
Index: applications/editors/josm/plugins/livegps/livegps/LiveGpsAcquirer.java
===================================================================
--- applications/editors/josm/plugins/livegps/livegps/LiveGpsAcquirer.java	(revision 6557)
+++ applications/editors/josm/plugins/livegps/livegps/LiveGpsAcquirer.java	(revision 6709)
@@ -5,4 +5,6 @@
 import java.beans.PropertyChangeListener;
 import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -11,4 +13,5 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Properties;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -20,4 +23,5 @@
 	String gpsdHost = "localhost";
 	int gpsdPort = 2947;
+	String configFile = "liveGPS.conf";
 	boolean shutdownFlag = false;
     private List<PropertyChangeListener> propertyChangeListener = new ArrayList<PropertyChangeListener>();
@@ -25,5 +29,34 @@
     private PropertyChangeEvent lastDataEvent;
 	
-	public LiveGpsAcquirer() {
+	public LiveGpsAcquirer(String pluginDir) {
+				
+		Properties liveGPSconfig = new Properties();
+		
+		FileInputStream fis = null;
+				
+		try {
+			fis = new FileInputStream(pluginDir + configFile);
+		} catch (FileNotFoundException e) {
+			System.err.println("No liveGPS.conf found, using defaults");
+		}
+		
+		if(fis != null)
+		{		
+			try {
+				liveGPSconfig.load(fis);
+				this.gpsdHost = liveGPSconfig.getProperty("host");
+				this.gpsdPort = Integer.parseInt(liveGPSconfig.getProperty("port"));
+				
+			} catch (IOException e) {
+				System.err.println("Error while loading liveGPS.conf, using defaults");
+			}
+			
+			if(this.gpsdHost == null || this.gpsdPort == 0)
+			{
+				System.err.println("Error in liveGPS.conf, using defaults");
+				this.gpsdHost = "localhost";
+				this.gpsdPort = 2947;
+			}
+		}
 		
 	}
Index: applications/editors/josm/plugins/livegps/livegps/LiveGpsDialog.java
===================================================================
--- applications/editors/josm/plugins/livegps/livegps/LiveGpsDialog.java	(revision 6557)
+++ applications/editors/josm/plugins/livegps/livegps/LiveGpsDialog.java	(revision 6709)
@@ -73,5 +73,6 @@
                 latLabel.setText(data.getLatitude() + "deg");
                 longLabel.setText(data.getLongitude() + "deg");
-                speedLabel.setText((data.getSpeed() * 3.6f) + "km/h"); // m(s to km/h
+                double mySpeed = data.getSpeed() * 3.6f;
+                speedLabel.setText((Math.round(mySpeed*100)/100) + "km/h"); // m(s to km/h
                 courseLabel.setText(data.getCourse() + "deg");
                 
Index: applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java
===================================================================
--- applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java	(revision 6557)
+++ applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java	(revision 6709)
@@ -30,5 +30,5 @@
     private LiveGpsDialog lgpsdialog;
     List<PropertyChangeListener>listenerQueue;
-    
+        
 	private GpxData data = new GpxData();
     private LiveGpsLayer lgpslayer;
@@ -125,5 +125,5 @@
         {
             if (acquirer == null) {
-                acquirer = new LiveGpsAcquirer();
+                acquirer = new LiveGpsAcquirer(getPluginDir());
                 if (lgpslayer == null) {
                     lgpslayer = new LiveGpsLayer(data);