diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d40af168aaa..14d9416c6c2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -13,7 +13,7 @@ See http://lucene.apache.org/solr for more information.
 
 Getting Started
 ---------------
-You need a Java 1.5 VM or later installed.
+You need a Java 1.6 VM or later installed.
 In this release, there is an example Solr server including a bundled 
 servlet container in the directory named "example".
 See the tutorial at http://lucene.apache.org/solr/tutorial.html
@@ -21,7 +21,7 @@ See the tutorial at http://lucene.apache.org/solr/tutorial.html
 
 $Id$
 
-==================  3.1.0-dev ==================
+==================  4.0.0-dev ==================
 Versions of Major Components
 ---------------------
 Apache Lucene trunk
diff --git a/solr/README.txt b/solr/README.txt
index a976d09e17f..062eeceeed3 100644
--- a/solr/README.txt
+++ b/solr/README.txt
@@ -65,10 +65,10 @@ src/
 Instructions for Building Apache Solr from Source
 -------------------------------------------------
 
-1. Download the J2SE 5.0 JDK (Java Development Kit) or later from http://java.sun.com.
+1. Download the Java SE 6 JDK (Java Development Kit) or later from http://java.sun.com.
    You will need the JDK installed, and the %JAVA_HOME%\bin directory included
    on your command path.  To test this, issue a "java -version" command from your
-   shell and verify that the Java version is 5.0 or later.
+   shell and verify that the Java version is 1.6 or later.
 
 2. Download the Apache Ant binary distribution (1.7.0 or greater) from http://ant.apache.org.
    You will need Ant installed and the %ANT_HOME%\bin directory included on your
diff --git a/solr/common-build.xml b/solr/common-build.xml
index aa45f82ac37..6715eab6591 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -55,7 +55,7 @@
   <property name="svnversion.exe" value="svnversion" />
 
   <!-- Java Version we are compatible with -->
-  <property name="java.compat.version" value="1.5" />
+  <property name="java.compat.version" value="1.6" />
 
   <!-- Solr Implementation Version -->
   <!--
@@ -94,7 +94,7 @@
   <property name="javadoc.years" value="2006 - ${year}" />
   <property name="javadoc.access" value="protected"/>
   <property name="javadoc.link.java"
-            value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
+            value="http://java.sun.com/javase/6/docs/api/"/>
   <property name="javadoc.link.junit"
             value="http://junit.sourceforge.net/javadoc/"/>
   <property name="javadoc.link.lucene"