diff --git a/jsoup-build.xml b/jsoup-build.xml
index 9cf3233..f669394 100644
--- a/jsoup-build.xml
+++ b/jsoup-build.xml
@@ -19,9 +19,9 @@
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
-  <property name="build.srcDir.0" value="src/main/java"/>
-  <property name="build.javadocDir.0" value="src/main/javadoc"/>
-  <property name="build.resourceDir.0" value="src/main/java"/>
+  <property name="build.srcDir" value="src/main/java"/>
+  <property name="build.javadocDir" value="src/main/javadoc"/>
+  <property name="build.resourceDir" value="src/main/java"/>
   <property name="build.resourceDir.1" value="."/>
 
   <property name="compiler.source" value="1.8"/>
@@ -64,12 +64,12 @@
            fork="false" 
            source="${compiler.source}">
       <src>
-        <pathelement location="${build.srcDir.0}"/>
+        <pathelement location="${build.srcDir}"/>
       </src>
       <classpath refid="build.classpath"/>
     </javac>
     <copy todir="${build.outputDir}">
-      <fileset dir="${build.resourceDir.0}">
+      <fileset dir="${build.resourceDir}">
         <include name="**/*.properties"/>
       </fileset>
     </copy>
@@ -88,7 +88,7 @@
   <!-- ====================================================================== -->
 
   <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${build.srcDir.0}" 
+    <javadoc sourcepath="${build.srcDir}" 
              packagenames="*" 
              destdir="${reporting.outputDirectory}/apidocs" 
              access="protected" 
@@ -108,7 +108,7 @@
              source="${compiler.source}"
              encoding="${project.build.sourceEncoding}"
              linksource="false" 
-             overview="${build.javadocDir.0}/overview.html" 
+             overview="${build.javadocDir}/overview.html" 
              doctitle="${project.name} ${project.version} API" 
              windowtitle="${project.name} ${project.version} API" 
              breakiterator="false">
@@ -131,7 +131,6 @@
         <attribute name="Bundle-Description" value="${project.description}"/>
         <attribute name="Bundle-DocURL" value="https://jsoup.org/"/>
         <attribute name="Bundle-License" value="https://jsoup.org/license"/>
-        <attribute name="Bundle-ManifestVersion" value="2"/>
         <attribute name="Bundle-Name" value="${project.name}"/>
         <attribute name="Bundle-SymbolicName" value="org.jsoup"/>
         <attribute name="Bundle-Vendor" value="${project.organization.name}"/>