diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp
index 4bcf5a4f97..9acf4ce937 100644
--- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp
+++ b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp
@@ -2,7 +2,7 @@
   <table class="footer">
     <tr>
       <td><a href="<spring:url value="/" escapeXml="true" />">Home</a></td>
-      <td align="right"><img src="<spring:url value="/images/springsource-logo.png" escapeXml="true" />" alt="Sponsored by SpringSource"/></td>
+      <td align="right"><img src="<spring:url value="/static/images/springsource-logo.png" escapeXml="true" />" alt="Sponsored by SpringSource"/></td>
     </tr>
   </table>
 
diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp
index a83f1bb316..f0876c20b8 100644
--- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp
+++ b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp
@@ -5,7 +5,7 @@
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="<spring:url value="/styles/petclinic.css" escapeXml="true" />" type="text/css"/>
+  <link rel="stylesheet" href="<spring:url value="/static/styles/petclinic.css" escapeXml="true" />" type="text/css"/>
   <title>PetClinic :: a Spring Framework demonstration</title>	
 </head>
 
diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp
index 8f54706fa7..9e9ec97f05 100644
--- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -1,13 +1,13 @@
 <%@ include file="/WEB-INF/jsp/includes.jsp" %>
 <%@ include file="/WEB-INF/jsp/header.jsp" %>
 
-<img src="<spring:url value="/images/pets.png" escapeXml="true" />" align="right" style="position:relative;right:30px;">
+<img src="<spring:url value="/static/images/pets.png" escapeXml="true" />" align="right" style="position:relative;right:30px;">
 <h2><fmt:message key="welcome"/></h2>
 
 <ul>
   <li><a href="<spring:url value="/owners/search" escapeXml="true" />">Find owner</a></li>
   <li><a href="<spring:url value="/vets" escapeXml="true" />">Display all veterinarians</a></li>
-  <li><a href="<spring:url value="/html/petclinic.html" escapeXml="true" />">Tutorial</a></li>
+  <li><a href="<spring:url value="/static/html/tutorial.html" escapeXml="true" />">Tutorial</a></li>
 </ul>
 
 <p>&nbsp;</p>
diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml
index 48ee4734de..06a6a31108 100644
--- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml
+++ b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml
@@ -14,6 +14,8 @@
 		<param-name>webAppRootKey</param-name>
 		<param-value>petclinic.root</param-value>
 	</context-param>
+	
+	
 
 	<!--
 		Location of the Log4J config file, for initialization and refresh checks.
@@ -88,26 +90,14 @@
 	<!--
 	 - Map static resources to the default servlet
 	 - examples:
-	 -     http://localhost:8080/images/pets.png
-	 -     http://localhost:8080/styles/petclinic.css
+	 -     http://localhost:8080/static/images/pets.png
+	 -     http://localhost:8080/static/styles/petclinic.css
 	-->
 	<servlet-mapping>
 		<servlet-name>default</servlet-name>
-		<url-pattern>*.png</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>default</servlet-name>
-		<url-pattern>*.gif</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>default</servlet-name>
-		<url-pattern>*.css</url-pattern>
+		<url-pattern>/static/*</url-pattern>
 	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>default</servlet-name>
-		<url-pattern>*.html</url-pattern>
-	</servlet-mapping>
-
+	
 	<!--
 		- Servlet that dispatches request to registered handlers (Controller implementations).
 		- Has its own application context, by default defined in "{servlet-name}-servlet.xml",
@@ -168,6 +158,4 @@
 	</resource-ref>
 	-->
 	
-	
-
 </web-app>
diff --git a/org.springframework.samples.petclinic/src/main/webapp/html/petclinic.html b/org.springframework.samples.petclinic/src/main/webapp/html/tutorial.html
similarity index 100%
rename from org.springframework.samples.petclinic/src/main/webapp/html/petclinic.html
rename to org.springframework.samples.petclinic/src/main/webapp/html/tutorial.html
diff --git a/org.springframework.samples.petclinic/src/main/webapp/styles/petclinic.css b/org.springframework.samples.petclinic/src/main/webapp/styles/petclinic.css
index d0841b2baa..e12f96af78 100644
--- a/org.springframework.samples.petclinic/src/main/webapp/styles/petclinic.css
+++ b/org.springframework.samples.petclinic/src/main/webapp/styles/petclinic.css
@@ -111,7 +111,7 @@ li {
 }
 
 li ul {
-	list-style: square url(images/sub-bullet.gif);
+	list-style: square url(../images/bullet-arrow.png);
 }
 
 li ul li ul {
@@ -231,4 +231,4 @@ fieldset th {
 	padding:2px 8px;
 	font-size:11px;
 	color:#888888;
-}
\ No newline at end of file
+}
