diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index 38886976fe..b245979484 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -8,6 +8,7 @@ Fixed bug 2315599 - False +: UseSingleton with class containing constructor
 Fixed bug 1955852 - false positives for UnusedPrivateMethod & UnusedLocalVariable
 Fixed bug 2404700 - UseSingleton should not act on enums
 Fixed bug 2225474 - VariableNamingConventions does not work with nonprimitives
+Fixed bug 1609038 - Xslt report generators break if path contains "java"
 Fixed bug - JUnitTestsShouldIncludeAssert now detects Junit 4 Assert.assert...  constructs
 
 New rule:
diff --git a/pmd/etc/xslt/corley-pmd-report.xslt b/pmd/etc/xslt/corley-pmd-report.xslt
index b2d5e09b83..5c42a7d209 100644
--- a/pmd/etc/xslt/corley-pmd-report.xslt
+++ b/pmd/etc/xslt/corley-pmd-report.xslt
@@ -97,7 +97,7 @@
     <xsl:for-each select="file">
         <xsl:sort data-type="number" order="descending" select="count(violation)"/>
         <xsl:variable name="filename" select="@name"/>
-        <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3>
+        <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3>
         <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute>
             <thead>
 				<tr>
diff --git a/pmd/etc/xslt/only-prio1.xslt b/pmd/etc/xslt/only-prio1.xslt
index 5075cb3a27..92b335a8b9 100644
--- a/pmd/etc/xslt/only-prio1.xslt
+++ b/pmd/etc/xslt/only-prio1.xslt
@@ -73,7 +73,7 @@
     <xsl:for-each select="file[violation/@priority=1]">
         <xsl:sort data-type="number" order="descending" select="count(violation[@priority = 1])"/>
         <xsl:variable name="filename" select="@name"/>
-        <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3>
+        <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3>
         <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute>
             <thead>
 				<tr>
diff --git a/pmd/etc/xslt/only-prio2.xslt b/pmd/etc/xslt/only-prio2.xslt
index d1991959ee..bb6dd03b4a 100644
--- a/pmd/etc/xslt/only-prio2.xslt
+++ b/pmd/etc/xslt/only-prio2.xslt
@@ -73,7 +73,7 @@
     <xsl:for-each select="file[violation/@priority=2]">
         <xsl:sort data-type="number" order="descending" select="count(violation[@priority = 2])"/>
         <xsl:variable name="filename" select="@name"/>
-        <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3>
+        <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3>
         <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute>
             <thead>
 				<tr>
diff --git a/pmd/etc/xslt/only-prio3.xslt b/pmd/etc/xslt/only-prio3.xslt
index c32116fbfa..445c4ac868 100644
--- a/pmd/etc/xslt/only-prio3.xslt
+++ b/pmd/etc/xslt/only-prio3.xslt
@@ -73,7 +73,7 @@
     <xsl:for-each select="file[violation/@priority=3]">
         <xsl:sort data-type="number" order="descending" select="count(violation[@priority = 3])"/>
         <xsl:variable name="filename" select="@name"/>
-        <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3>
+        <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3>
         <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute>
             <thead>
 				<tr>
diff --git a/pmd/etc/xslt/only-prio4.xslt b/pmd/etc/xslt/only-prio4.xslt
index 28552f7506..9a60c27642 100644
--- a/pmd/etc/xslt/only-prio4.xslt
+++ b/pmd/etc/xslt/only-prio4.xslt
@@ -73,7 +73,7 @@
     <xsl:for-each select="file[violation/@priority=4]">
         <xsl:sort data-type="number" order="descending" select="count(violation[@priority = 4])"/>
         <xsl:variable name="filename" select="@name"/>
-        <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3>
+        <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3>
         <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute>
             <thead>
 				<tr>
diff --git a/pmd/etc/xslt/only-prio5.xslt b/pmd/etc/xslt/only-prio5.xslt
index b97f2d3919..8045206424 100644
--- a/pmd/etc/xslt/only-prio5.xslt
+++ b/pmd/etc/xslt/only-prio5.xslt
@@ -73,7 +73,7 @@
     <xsl:for-each select="file[violation/@priority=4]">
         <xsl:sort data-type="number" order="descending" select="count(violation[@priority = 5])"/>
         <xsl:variable name="filename" select="@name"/>
-        <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3>
+        <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3>
         <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute>
             <thead>
 				<tr>
diff --git a/pmd/etc/xslt/pmd-report-per-class.xslt b/pmd/etc/xslt/pmd-report-per-class.xslt
index b45ceb2d37..741c631a32 100644
--- a/pmd/etc/xslt/pmd-report-per-class.xslt
+++ b/pmd/etc/xslt/pmd-report-per-class.xslt
@@ -75,7 +75,7 @@
     <xsl:for-each select="file">
         <xsl:sort data-type="number" order="descending" select="count(violation)"/>
         <xsl:variable name="filename" select="@name"/>
-        <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3>
+        <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3>
         <table border="0" width="100%" class="sortable"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute>
             <tr>
 				<th>Prio</th>
diff --git a/pmd/etc/xslt/wz-pmd-report.xslt b/pmd/etc/xslt/wz-pmd-report.xslt
index f83461049f..e396909d94 100644
--- a/pmd/etc/xslt/wz-pmd-report.xslt
+++ b/pmd/etc/xslt/wz-pmd-report.xslt
@@ -83,7 +83,7 @@
 	    <xsl:for-each select="violation">
 		    <tr>
 			<td style="padding: 3px" align="right"><div><xsl:attribute name="class"><xsl:call-template name="priorityDiv"/></xsl:attribute><xsl:value-of disable-output-escaping="yes" select="@priority"/></div></td>
-			<td style="padding: 3px" align="left"><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(../@name,'/','.'),'.java')"/></td>
+			<td style="padding: 3px" align="left"><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></td>
 			<td style="padding: 3px" align="right"><xsl:value-of disable-output-escaping="yes" select="@beginline"/></td>
 			<td style="padding: 3px" align="left" width="100%"><xsl:if test="@externalInfoUrl"><a><xsl:attribute name="href"><xsl:value-of select="@externalInfoUrl"/></xsl:attribute><xsl:call-template name="message"/></a></xsl:if><xsl:if test="not(@externalInfoUrl)"><xsl:call-template name="message"/></xsl:if></td>
 		    </tr>