diff --git a/README b/README
index 94ca9e49372..82ea1e30a4d 100644
--- a/README
+++ b/README
@@ -22,7 +22,7 @@
 
    o  Java Interpreter:
 
-      A fully compliant Java 1.5 (or later) Runtime Environment is required 
+      A fully compliant Java 6 (or later) Runtime Environment is required 
       for Apache JMeter to execute.
 
    o  Optional jars:
diff --git a/build.xml b/build.xml
index 31714b89295..b2a01f25607 100644
--- a/build.xml
+++ b/build.xml
@@ -327,8 +327,8 @@
   <!-- Compilation parameters -->
   <property name="optimize" value="on"/>
   <property name="deprecation" value="off"/>
-  <property name="target.java.version" value="1.5"/>
-  <property name="src.java.version" value="1.5"/>
+  <property name="target.java.version" value="1.6"/>
+  <property name="src.java.version" value="1.6"/>
   <property name="encoding" value="UTF-8"/>
   <!-- Set test encoding to the same default, but allow override -->
   <property name="test.encoding" value="${encoding}"/>
@@ -1938,7 +1938,7 @@ run JMeter unless all the JMeter jars are added.
       packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
       excludepackagenames="org.apache.jorphan.timer">
       <classpath refid="classpath"/>
-      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
+      <link href="http://docs.oracle.com/javase/6/docs/api/"/>
     </javadoc>
   </target>
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 3c6d7407dce..2d407e54619 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -210,6 +210,7 @@ and right angle bracket (&gt;) in search filter tag in XML response data</li>
 <li><bugzilla>53956</bugzilla> - Add ability to paste (a list of values) from clipboard for Header Manager</li>
 <li>Updated to HttpComponents Client 4.2.2 (from 4.2.1)</li>
 <li><bugzilla>54110</bugzilla> - BSFTestElement and JSR223TestElement should use shared super-class for common fields</li>
+<li><bugzilla>54199</bugzilla> - Move to Java 6</li>
 </ul>
 
 </section> 
diff --git a/xdocs/download_jmeter.xml b/xdocs/download_jmeter.xml
index 891b009626c..300a73946f3 100644
--- a/xdocs/download_jmeter.xml
+++ b/xdocs/download_jmeter.xml
@@ -75,7 +75,7 @@
       <a href="http://www.apache.org/dist/jmeter/KEYS">KEYS</a>
       </p>
     </section>
-    <section name="Apache JMeter &release; (Requires Java 1.5 or later)">
+    <section name="Apache JMeter &release; (Requires Java 6 or later)">
       <subsection name="Binaries" anchor="binaries">
         <table>
           <tr>
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 7eb886f37df..f6fa8ef3d06 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -526,7 +526,7 @@ the additional variables for rows 4, 5 and 6 will be removed.
         <property name="Parameter types" required="Yes, if a prepared or callable statement has parameters">
         Comma-separated list of SQL parameter types (e.g. INTEGER, DATE, VARCHAR, DOUBLE) or integer values of Constants when for example you use custom database types proposed by driver (-10 for OracleTypes.CURSOR for example).<br/>
         These are defined as fields in the class java.sql.Types, see for example:<br/>
-        <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/sql/Types.html">Javadoc for java.sql.Types</a>.<br/>
+        <a href="http://docs.oracle.com/javase/6/docs/api/java/sql/Types.html">Javadoc for java.sql.Types</a>.<br/>
         [Note: JMeter will use whatever types are defined by the runtime JVM, 
         so if you are running on a different JVM, be sure to check the appropriate document]<br/>
         <b>If the callable statement has INOUT or OUT parameters, then these must be indicated by prefixing the
diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index ee88fa16b20..00c99351f3a 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -68,7 +68,7 @@ over your Test Plans.</p>
 <p>JMeter requires your computing environment meets some minimum requirements.</p>
 
 <subsection name="&sect-num;.1.1 Java Version" anchor="java_versions">
-<note>JMeter requires a fully compliant JVM 1.5 or higher.  
+<note>JMeter requires a fully compliant JVM 6 or higher.  
 </note>
 <p>Because JMeter uses only standard Java APIs, please do not file bug reports if your JRE fails to run
 JMeter because of JRE implementation issues.</p>
@@ -89,7 +89,7 @@ on JMeter wiki.</p>
 
 
 <subsection name="&sect-num;.2.1 Java Compiler" anchor="opt_compiler">
-<p>If you want to build the JMeter source or develop JMeter plugins, then you will need a fully compliant JDK 1.5 or higher.</p>
+<p>If you want to build the JMeter source or develop JMeter plugins, then you will need a fully compliant JDK 6 or higher.</p>
 </subsection>
 
 <subsection name="&sect-num;.2.2 SAX XML Parser" anchor="opt_sax">
diff --git a/xdocs/usermanual/listeners.xml b/xdocs/usermanual/listeners.xml
index 2e8f527b709..c6962872c77 100644
--- a/xdocs/usermanual/listeners.xml
+++ b/xdocs/usermanual/listeners.xml
@@ -193,7 +193,7 @@ sampleresult.timestamp.start=true
 </code></p>
 <p>
 The date format to be used for the timestamp_format is described in <a
-HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/text/SimpleDateFormat.html">
+HREF="http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html">
 <b>SimpleDateFormat</b></a>.
 Bear in mind that choosing a date format other than "ms" is likely to
 make it impossible for JMeter to interpret the value when it is read