Index: lucene/lucene.bnd
===================================================================
--- lucene/lucene.bnd	(revision 0)
+++ lucene/lucene.bnd	(revision 0)
@@ -0,0 +1,17 @@
+Export-Package: *;-split-package:=merge-first
+Extension-Name: ${implementation.title}
+Specification-Title: ${title}
+Specification-Version: ${spec.version}
+Specification-Vendor: The Apache Software Foundation
+Implementation-Title: org.apache.lucene
+Implementation-Version: ${version} ${svnversion} - ${user.name} - ${DSTAMP} ${TSTAMP}
+Implementation-Vendor: The Apache Software Foundation
+X-Compile-Source-JDK: ${javac.source}
+X-Compile-Target-JDK: ${javac.target}
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-SymbolicName: org.apache.lucene.${name}
+Bundle-Name: Lucene Search Engine: ${ant.project.name}
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: ${version}
+Bundle-Description: ${bnd.project.description}
+Bundle-DocURL: http://www.apache.org/
Index: lucene/build.xml
===================================================================
--- lucene/build.xml	(revision 1162912)
+++ lucene/build.xml	(working copy)
@@ -177,9 +177,9 @@
   <target name="javadocs" description="Generate javadoc" 
           depends="javadocs-all, javadocs-core, javadocs-contrib, javadocs-test-framework">
     <echo file="${javadoc.dir}/index.html" append="false">
-<![CDATA[<html><head><title>${Name} ${version} Javadoc Index</title></head>
+<![CDATA[<html><head><title>${LuceneName} ${version} Javadoc Index</title></head>
 <body>
-<h1>${Name} ${version} Javadoc Index</h1>
+<h1>${LuceneName} ${version} Javadoc Index</h1>
 <ul>
   <li><a href="all/index.html">All</a></li>
   <li><a href="core/index.html">Core</a></li>
@@ -198,7 +198,7 @@
       <mkdir dir="${javadoc.dir}/core"/>
       <invoke-javadoc
         destdir="${javadoc.dir}/core"
-      	title="${Name} ${version} core API">
+      	title="${LuceneName} ${version} core API">
         <sources>
           <packageset dir="src/java"/>
           <link href=""/>
@@ -544,7 +544,7 @@
       <invoke-javadoc
           overview="src/test-framework/overview.html"
           destdir="${javadoc.dir}/test-framework"
-          title="${Name} ${version} Test Framework API">
+          title="${LuceneName} ${version} Test Framework API">
         <sources>
           <packageset dir="src/test-framework"/>
           <link href=""/>
Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1162912)
+++ lucene/common-build.xml	(working copy)
@@ -44,7 +44,7 @@
   </tstamp>
 
   <property name="name" value="${ant.project.name}"/>
-  <property name="Name" value="Lucene"/>
+  <property name="LuceneName" value="Lucene"/>
   <property name="dev.version" value="4.0-SNAPSHOT"/>
   <property name="tests.luceneMatchVersion" value="4.0"/>
   <property name="version" value="${dev.version}"/>
@@ -71,6 +71,12 @@
       <include name="maven-ant-tasks-*.jar"/>
     </fileset>
   </path>
+	
+  <path id="bnd.classpath">
+	<fileset dir="${common.dir}/lib">
+	  <include name="biz.aQute.*.jar"/>
+	</fileset>
+  </path>
 
   <!-- default arguments to pass to JVM executing tests -->
   <property name="testmethod" value=""/>
@@ -372,43 +378,29 @@
     <attribute name="implementation.title"/>
     <attribute name="spec.version"/>
     <sequential>
-      <manifest file="${manifest.file}">
-        <!--
-        http://java.sun.com/j2se/1.5.0/docs/guide/jar/jar.html#JAR%20Manifest
-        http://java.sun.com/j2se/1.5.0/docs/guide/versioning/spec/versioning2.html
-        http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Package.html
-        http://java.sun.com/j2se/1.5.0/docs/api/java/util/jar/package-summary.html
-        http://java.sun.com/developer/Books/javaprogramming/JAR/basics/manifest.html
-        -->
-        <!-- Don't set 'Manifest-Version' it identifies the version of the
-             manifest file format, and should always be 1.0 (the default)
-
-             Don't set 'Created-by' attribute, its purpose is
-             to identify the version of java used to build the jar,
-             which ant will do by default.
-
-             Ant will happily override these with bogus strings if you
-             tell it to, so don't.
-
-             NOTE: we don't use section info because all of our manifest data
-             applies to the entire jar/war ... no package specific info.
-        -->
-        <attribute name="Extension-Name" value="@{implementation.title}"/>
-        <attribute name="Specification-Title" value="@{title}"/>
-        <!-- spec version must match "digit+{.digit+}*" -->
-        <attribute name="Specification-Version" value="@{spec.version}"/>
-        <attribute name="Specification-Vendor"
-                   value="The Apache Software Foundation"/>
-        <attribute name="Implementation-Title" value="@{implementation.title}"/>
-        <!-- impl version can be any string -->
-        <attribute name="Implementation-Version"
-                   value="${version} ${svnversion} - ${user.name} - ${DSTAMP} ${TSTAMP}"/>
-        <attribute name="Implementation-Vendor"
-                   value="The Apache Software Foundation"/>
-        <attribute name="X-Compile-Source-JDK" value="${javac.source}"/>
-        <attribute name="X-Compile-Target-JDK" value="${javac.target}"/>
-      </manifest>
-    </sequential>
+      <tstamp prefix="start">
+    	  <format property="touch.time" pattern="hh:mm.ss.SS" />
+      </tstamp>
+      <echo message="Time starting for the build of manifest.mf: ${start.touch.time}"/>
+      <xmlproperty file="${ant.file}" collapseAttributes="true" prefix="bnd"/>
+      <property name="title" value="@{title}" />
+      <property name="implementation.title" value="@{implementation.title}" />
+      <property name="bndclasspath" refid="classpath"/>
+  	  <property name="-savemanifest" value="${manifest.file}"/>
+      <property name="-output" value="${manifest.file}"/>
+      <property name="-removeheaders" value="TSTAMP,DSTAMP,TODAY,LuceneName"/>
+  	  <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" /> 
+  	  <bnd 
+  	      classpath="${bndclasspath}" 
+  	      eclipse="false" 
+  	      failok="false" 
+  	      exceptions="true"
+  	      files="${common.dir}/lucene.bnd" /> 
+      <tstamp prefix="end">
+      	  <format property="touch.time" pattern="hh:mm.ss.SS" />
+      </tstamp>
+      <echo message="Time ending for the build of manifest.mf: ${end.touch.time}"/>
+  	</sequential>
   </macrodef>
 	
   <macrodef name="jarify" description="Builds a JAR file">
@@ -816,7 +808,7 @@
   <macrodef name="invoke-javadoc">
     <element name="sources" optional="yes"/>
     <attribute name="destdir"/>
-  	<attribute name="title" default="${Name} ${version} API"/>
+  	<attribute name="title" default="${LuceneName} ${version} API"/>
     <attribute name="overview" default="${src.dir}/overview.html"/>
     <sequential>
       <copy todir="@{destdir}/../prettify" overwrite="false">
@@ -837,7 +829,7 @@
           failonerror="true"
           source="${ant.java.version}"
           link="${javadoc.link}"
-          windowtitle="${Name} ${version} API"
+          windowtitle="${LuceneName} ${version} API"
           doctitle="@{title}"
           stylesheetfile="@{destdir}/../prettify/stylesheet+prettify.css"
           maxmemory="${javadoc.maxmemory}"
Index: lucene/contrib/contrib-build.xml
===================================================================
--- lucene/contrib/contrib-build.xml	(revision 1162912)
+++ lucene/contrib/contrib-build.xml	(working copy)
@@ -89,7 +89,7 @@
        <mkdir dir="${javadoc.dir}/contrib-${name}"/>
        <invoke-javadoc
          destdir="${javadoc.dir}/contrib-${name}"
-       	title="${Name} ${version} contrib-${name} API">
+       	title="${LuceneName} ${version} contrib-${name} API">
          <sources>
            <link href=""/>
            <packageset dir="${src.dir}"/>
Index: solr/common-build.xml
===================================================================
--- solr/common-build.xml	(revision 1162912)
+++ solr/common-build.xml	(working copy)
@@ -23,7 +23,7 @@
 
   <dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
   
-  <property name="Name" value="Solr" />
+  <property name="LuceneName" value="Solr" />
   <property name="version" value="4.0-SNAPSHOT"/>
   <property name="fullname" value="apache-${ant.project.name}"/>
   <property name="fullnamever" value="${fullname}-${version}"/>
@@ -217,7 +217,7 @@
       <mkdir dir="${javadoc.dir}"/>
       <mkdir dir="${dest}/META-INF/"/>
       <invoke-javadoc destdir="${javadoc.dir}"
-                      title="${Name} ${version} ${name} API">
+                      title="${LuceneName} ${version} ${name} API">
         <sources>
           <link href=""/>
           <packageset dir="${src.dir}"/>
Index: modules/analysis/icu/build.xml
===================================================================
--- modules/analysis/icu/build.xml	(revision 1162912)
+++ modules/analysis/icu/build.xml	(working copy)
@@ -120,7 +120,7 @@
        <mkdir dir="${javadoc.dir}/contrib-${name}"/>
        <invoke-javadoc
          destdir="${javadoc.dir}/contrib-${name}"
-       	 title="${Name} ${version} contrib-${name} API">
+       	 title="${LuceneName} ${version} contrib-${name} API">
          <sources>
            <link href="../contrib-analyzers-common"/>
            <link href=""/>
