--- org/apache/jasper/compiler/TagPluginManager.java	(revision 1416791)
+++ org/apache/jasper/compiler/TagPluginManager.java	(working copy)
@@ -68,14 +68,25 @@ 
         });
 
     }
- 
+    
+    public static final String DEFAULT_TAG_PLUGINS_XML = System.getProperty("org.apache.jasper.compiler.tagplugins.DEFAULT_TAG_PLUGINS_XML");
+    
     private void init(ErrorDispatcher err) throws JasperException {
         if (initialized)
             return;
 
         InputStream is = ctxt.getResourceAsStream(TAG_PLUGINS_XML);
-        if (is == null)
-            return;
+        if (is == null) {
+        	if (DEFAULT_TAG_PLUGINS_XML != null) {
+	        	is = ctxt.getClassLoader().getResourceAsStream(DEFAULT_TAG_PLUGINS_XML);
+                if (is == null) {
+	        		return;
+	        	}
+        	}
+        	else {
+                return;
+        	}
+        }
 
         TreeNode root = (new ParserUtils()).parseXMLDocument(TAG_PLUGINS_XML,
                                                              is);