diff --git a/CHANGES.txt b/CHANGES.txt
index b99f40bccd7..25dc916ac8a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -170,5 +170,7 @@ Other Changes
 12. Added new numeric build property "specversion" to allow clean
     MANIFEST.MF files (hossman)
 13. Added Solr/Lucene versions to "Info" page (hossman)
+14. Explicitly set mime-type of .xsl files in web.xml to
+    application/xslt+xml (hossman)
 
 2006/01/17 Solr open sourced, moves to Apache Incubator
diff --git a/src/webapp/WEB-INF/web.xml b/src/webapp/WEB-INF/web.xml
index 1b997a62e29..9e937324e92 100644
--- a/src/webapp/WEB-INF/web.xml
+++ b/src/webapp/WEB-INF/web.xml
@@ -66,5 +66,11 @@
     <servlet-name>ping</servlet-name>
     <url-pattern>/admin/ping</url-pattern>
   </servlet-mapping>
+  
+  <mime-mapping>
+    <extension>.xsl</extension>
+    <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ -->
+    <mime-type>application/xslt+xml</mime-type>
+  </mime-mapping>
 
 </web-app>