diff --git a/pom.xml b/pom.xml
index 224071c8cb..fd8b09f9ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,9 +290,11 @@
 					<header>Spring Integration</header>
 					<source>1.5</source>
 					<quiet>true</quiet>
-					<!-- TODO: update stylesheet to s2 green L&F -->
-					<stylesheetfile>${basedir}/src/main/javadoc/javadoc.css</stylesheetfile>
+					<javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
 					<overview>${basedir}/src/main/javadoc/overview.html</overview>
+					<stylesheetfile>${basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
+					<!-- copies doc-files subdirectory which contains image resources -->
+					<docfilessubdirs>true</docfilessubdirs>
 					<groups>
 						<group>
 							<title>Spring Integration</title>
@@ -300,7 +302,6 @@
 						</group>
 						<!-- TODO: fill in other groups -->
 					</groups>
-					<javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
 					<excludePackageNames>org.springframework.integration.samples</excludePackageNames>
 					<links>
 						<!-- TODO: examine JavaDoc warnings and see what other api links are needed -->
diff --git a/src/main/javadoc/doc-files/th-background.png b/src/main/javadoc/doc-files/th-background.png
new file mode 100644
index 0000000000..72d65e771f
Binary files /dev/null and b/src/main/javadoc/doc-files/th-background.png differ
diff --git a/src/main/javadoc/javadoc.css b/src/main/javadoc/javadoc.css
deleted file mode 100644
index 1f009c4bc0..0000000000
--- a/src/main/javadoc/javadoc.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Spring-specific Javadoc style sheet rules */
-
-#overviewBody {
-
-}
-
-.code {
-	border: 1px solid black;
-	background-color: #F4F4F4;
-	padding: 5px;
-}
-
-/* Vanilla Javadoc style sheet rules */
-
-body {
-	font-family: Helvetica, Arial, sans-serif;
-	background-color: white;
-	font-size: 10pt;
-}
-
-td { font-size: 10pt; font-family: Helvetica, Arial, sans-serif }/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF }
-
-/* Headings */
-h1 { font-size: 145% }
-
-/* Table colors */
-.TableHeadingColor     { background: #CCCCFF } /* Dark mauve */
-.TableSubHeadingColor  { background: #EEEEFF } /* Light mauve */
-.TableRowColor         { background: #FFFFFF } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif }
-.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif }
-.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif }
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEEFF;} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
-.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
diff --git a/src/main/javadoc/spring-javadoc.css b/src/main/javadoc/spring-javadoc.css
new file mode 100644
index 0000000000..c438fafa56
--- /dev/null
+++ b/src/main/javadoc/spring-javadoc.css
@@ -0,0 +1,178 @@
+/* stylesheet.css 2008/04/22 nicolekonicki */
+
+/*
+ *
+ * Spring-specific Javadoc style sheet
+ *
+ */
+
+
+
+.code 
+{
+	border: 1px solid black;
+	background-color: #F4F4F4;
+	padding: 5px;
+}
+
+body 
+{
+	font: 12px Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
+	background-color: #fff;
+	color: #333;
+}
+
+
+/* Link colors */
+a 
+{
+	color:#2c7b14;
+	text-decoration:none; 
+}
+
+a:hover 
+{
+	text-decoration:underline;
+}
+
+/* Headings */
+h1 
+{ 
+	font-size:28px;
+	color:#007c00; 
+}
+
+/* Table colors */
+
+table
+{
+	border:none;
+}
+
+td
+{
+	border:none;
+	border-bottom:1px dotted #ddd;
+}
+
+th
+{
+	border:none;
+}
+
+.TableHeadingColor th
+{
+	background-color: #efffcb;
+	background-image: url(doc-files/th-background.png);
+	background-repeat: repeat-x;
+	color:#fff;
+	font-size:14px;
+	height:26px;
+}
+
+.TableSubHeadingColor  
+{ 
+	background: #f7ffee;
+
+} 
+.TableRowColor         
+{ 
+	background: #fff;
+}
+
+.TableRowColor a      
+{ 
+	border-bottom:none;
+	color:#2c7b14;
+	font-weight:normal;
+}
+
+tr.TableRowColor:hover
+{
+	background:#eef2e1;
+}
+
+ 
+/* Font used in left-hand frame lists */
+.FrameTitleFont   
+{ 
+	font-size: 120%; 
+	font-weight:bold;
+}
+
+.FrameTitleFont a   
+{  
+	color: #333;
+}
+
+.FrameHeadingFont 
+{ 
+	font-weight: bold;
+	font-size:95%;
+}
+
+.FrameItemFont    
+{ 
+	line-height:130%;
+	font-size: 95%; 
+}
+
+.FrameItemFont a
+{
+	color:#333;
+}
+
+.FrameItemFont a:hover
+{
+	color:#249901;
+	border-bottom:none;
+	text-decoration:underline;
+}
+
+/* Navigation bar fonts and colors */
+.NavBarCell1    
+{ 
+	background-color:#fff;
+	border:none;
+} 
+
+.NavBarCell1Rev 
+{ 
+	background-color:#e3faa5;
+	border:1px solid #9ad00c;
+	padding:0;
+	margin:0;
+} 
+
+.NavBarCell1 a  
+{ 
+	color:#333;
+	text-decoration:none;
+}
+
+.NavBarFont1Rev 
+{ 
+
+}
+
+.NavBarCell2
+{
+	border:none;
+}
+
+.NavBarCell2 a    
+{ 
+	color:#249901;
+	font-size:90%;
+}
+
+.NavBarCell3    
+{ 
+	border:none;
+}
+
+/* Override sizes in font tags */
+font
+{
+	font: inherit !important;
+}