--- freemarker-2.3.13/build.xml.orig	2011-02-28 15:02:29.572173242 -0500
+++ freemarker-2.3.13/build.xml	2011-02-28 15:02:39.340418592 -0500
@@ -48,8 +48,6 @@
     <property name="lib.struts" location="lib/struts.jar"/>
     <property name="lib.rhino" location="lib/js.jar"/>
     <property name="lib.servlet" location="lib/servlet.jar"/>
-    <property name="lib.jsp12" location="lib/jsp-api-1.2.jar"/>
-    <property name="lib.jsp20" location="lib/jsp-api-2.0.jar"/>
     <property name="lib.jsp21" location="lib/jsp-api-2.1.jar"/>
     <property name="lib.el" location="lib/el-api.jar"/>
 	
@@ -83,9 +81,9 @@
         <pathelement path="${lib.jsp12}"/>
     </path>
 
-    <path id="compile.jsp2.classpath">
+    <path id="compile.jsp21.classpath">
 	<path refid="compile.nojsp.classpath"/>
-	<pathelement path="${lib.jsp20}"/>
+	<pathelement path="${lib.jsp21}"/>
     </path>
     
     <path id="compile.classpath.testcases">
@@ -93,7 +91,7 @@
         <pathelement path="${lib.jython}"/>
         <pathelement path="${lib.jdom}"/>
         <pathelement path="${lib.servlet}"/>
-        <pathelement path="${lib.jsp20}"/>
+        <pathelement path="${lib.jsp21}"/>
     </path>
 
     <path id="compile.classpath.javadoc">
@@ -221,9 +219,9 @@
         <include name="freemarker/ext/jsp/FreeMarkerPageContext1.java"/>
     </patternset>
 
-    <patternset id="freemarker.compile.jsp2">
-        <include name="freemarker/ext/jsp/FreeMarkerPageContext2.java"/>
-        <include name="freemarker/ext/jsp/FreeMarkerJspFactory2.java"/>
+    <patternset id="freemarker.compile.jsp21">
+        <include name="freemarker/ext/jsp/FreeMarkerPageContext21.java"/>
+        <include name="freemarker/ext/jsp/FreeMarkerJspFactory21.java"/>
     </patternset>
 
     <!-- Pattern set for FreeMarker test case compilation -->
@@ -451,7 +449,7 @@
         <antcall target="compile-jdk14"/>
         <antcall target="compile-jdk15"/>
 <!--        <antcall target="compile-jsp1"/> -->
-        <antcall target="compile-jsp2"/>
+        <antcall target="compile-jsp21"/>
         <antcall target="compile-jython"/>
         <antcall target="compile-dom4j"/>
 <!--        <antcall target="compile-jdom"/> -->
@@ -513,11 +511,11 @@
         </javac>
     </target>
 
-    <target name="compile-jsp2">
+    <target name="compile-jsp21">
         <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="6" source="6">
             <src path="${src.dir}"/>
-            <classpath refid="compile.jsp2.classpath"/>
-            <patternset refid="freemarker.compile.jsp2"/>
+            <classpath refid="compile.jsp21.classpath"/>
+            <patternset refid="freemarker.compile.jsp21"/>
         </javac>
     </target>