diff --git a/jboss/plugin.jelly b/jboss/plugin.jelly
index 8c605b3f..978dec1b 100644
--- a/jboss/plugin.jelly
+++ b/jboss/plugin.jelly
@@ -125,13 +125,18 @@
   <goal name="jboss:start" prereqs="jboss:init"
     description="Starts JBoss with our specific server configuration">
 
+    <!-- Construct a URL valid on any OS -->
+    <j:new var="jbossfile" className="java.io.File">
+      <j:arg value="${maven.jboss.build.dir}/${maven.jboss.conf.name}"/>
+    </j:new>
+    <j:set var="jbossurl" value="${jbossfile.toURL()}"/>
+
     <java classname="org.jboss.Main" fork="yes" dir="${maven.jboss.home}/bin">
 
       <sysproperty key="program.name" file="${maven.jboss.home}/bin/run.bat"/>
       <sysproperty key="jboss.server.home.dir" 
         file="${maven.jboss.build.dir}/${maven.jboss.conf.name}"/>
-      <sysproperty key="jboss.server.home.url"
-        value="file:/${maven.jboss.build.dir}/${maven.jboss.conf.name}"/>
+      <sysproperty key="jboss.server.home.url" value="${jbossurl}"/>
 
       <arg line="-c ${maven.jboss.conf.name}"/>
 
@@ -153,7 +158,7 @@
     description="Stops JBoss">
 
     <java classname="org.jboss.Shutdown" fork="yes">
-      <arg value="localhost"/>
+      <arg value="${maven.jboss.hostname}"/>
 
       <classpath>
         <pathelement location="${maven.jboss.home}/bin/shutdown.jar"/>
diff --git a/jboss/plugin.properties b/jboss/plugin.properties
index 5af36a90..071b72c9 100644
--- a/jboss/plugin.properties
+++ b/jboss/plugin.properties
@@ -44,3 +44,6 @@ maven.jboss.default.deploy.dir = ${maven.jboss.home}/server/default/deploy
 maven.jboss.default.deploy.includes = **/*
 maven.jboss.default.deploy.excludes =
 
+# Host name of the server where JBoss is running.
+# Note: This is used to shut JBoss down.
+maven.jboss.hostname = localhost
diff --git a/jboss/xdocs/changes.xml b/jboss/xdocs/changes.xml
index 33d4d7f8..f182acd6 100644
--- a/jboss/xdocs/changes.xml
+++ b/jboss/xdocs/changes.xml
@@ -7,6 +7,17 @@
 
   <body>
 
+    <release version="1.1" date="in CVS">
+      <action dev="vmassol" type="add" due-to="James Ward" due-to-email="james@ectropic.com">
+        Added new <code>maven.jboss.hostname</code> plugin property.
+        It defaults to <code>localhost</code> and gives the host name
+        of the server to stop when calling <code>maven jboss:stop</code>.
+      </action>
+      <action dev="vmassol" type="fix" due-to="James Ward" due-to-email="james@ectropic.com">
+        JBoss failed to start on unix. This has been fixed.
+      </action>
+    </release>
+    
     <release version="1.0" date="2003-04-08">
       <action dev="vmassol" type="add">
         Plugin creation.