diff --git a/jxr/plugin.jelly b/jxr/plugin.jelly
index dbbbbf5a..c866a22f 100644
--- a/jxr/plugin.jelly
+++ b/jxr/plugin.jelly
@@ -4,6 +4,7 @@
   xmlns:j="jelly:core"  
   xmlns:define="jelly:define"
   xmlns:doc="doc"
+  xmlns:util="jelly:util"
   xmlns:jxr="jxr">
 
   <goal name="maven-jxr-plugin:register">
@@ -72,12 +73,13 @@
         
     <!-- XXX This is a dirty hack until the semantics of pom.build.sourceDirectory are cleared up -->
     <j:set var="sourceDir" value="${pom.build.sourceDirectory}"/>  
-    <j:if test="${!pom.build.sourceDirectory.startsWith(basedir)}">
-    	<j:set var="sourceDir" value="${basedir}/${pom.build.sourceDirectory}"/>
+    <util:file var="sourceDirFile" name="${sourceDir}"/>
+    
+    <j:if test="${!sourceDirFile.isAbsolute()}">
+    	<j:set var="sourceDir" value="${basedir}/${sourceDir}"/>
     </j:if>
-        
+    
     <jxr:jxr
-      basedir="${basedir}"
       sourceDir="${sourceDir}"
       destDir="${maven.jxr.destdir}"
       templateDir="${maven.jxr.templateDir}"
diff --git a/jxr/src/main/org/apache/maven/jxr/JxrBean.java b/jxr/src/main/org/apache/maven/jxr/JxrBean.java
index 19d3eeda..4bb58dc2 100644
--- a/jxr/src/main/org/apache/maven/jxr/JxrBean.java
+++ b/jxr/src/main/org/apache/maven/jxr/JxrBean.java
@@ -80,7 +80,7 @@ import org.apache.commons.logging.LogFactory;
  * @author <a href="mailto:lucas@collab.net">Josh Lucas</a>
  * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
  * @author <a href="mailto:brian@brainslug.com">Brian Leonard</a>
- * @version $Id: JxrBean.java,v 1.4 2003/02/21 22:33:53 bwalding Exp $
+ * @version $Id: JxrBean.java,v 1.5 2003/02/24 13:58:52 bwalding Exp $
  */
 public class JxrBean
 {
@@ -92,14 +92,13 @@ public class JxrBean
     /*
      * See the doc comments for the corresponding getter/setter methods
      */
-    private File basedir;
     private List sourceDirs;
     private String destDir;
     private String javadocDir;
     private String windowTitle;
-    private String docTitle;;
-    private String bottom;;
-    private String templateDir;;
+    private String docTitle;
+    private String bottom;
+    private String templateDir;
 
     /**
      * Default constructor
@@ -147,31 +146,6 @@ public class JxrBean
         indexer.process();
     }
     
-    /**
-     * Set the base directory to which the sourceDirs are relative
-     *
-     * @param basedir base directory
-     */
-    public void setBasedir(File basedir)
-    {
-        this.basedir = basedir;
-    }
-    
-    /**
-     * see setBaseDir(File)
-     *
-     * @see setBasedir(File)
-     */
-    public File getBasedir()
-    {
-        if (basedir == null)
-        {
-            return new File(".");
-        }
-        
-        return basedir;
-    }        
-
     /**
      * Creates a relative link from one directory to another.
      *