Index: lucene/lucene.bnd
===================================================================
--- lucene/lucene.bnd	(revision 0)
+++ lucene/lucene.bnd	(revision 0)
@@ -0,0 +1,16 @@
+Export-Package: *;-split-package:=merge-first
+Specification-Title: Lucene Search Engine: ${ant.project.name}
+Specification-Version: ${spec.version}
+Specification-Vendor: The Apache Software Foundation
+Implementation-Title: org.apache.lucene
+Implementation-Version: ${version} ${svnversion} - ${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-DocUR: http://www.apache.org/
Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1143444)
+++ lucene/common-build.xml	(working copy)
@@ -360,24 +360,24 @@
 	
   <macrodef name="build-manifest" description="Builds a manifest file">
   	<attribute name="title" default="Lucene Search Engine: ${ant.project.name}" />
+  	<attribute name="bndtempDir" default="${build.dir}/temp"/>
   	<sequential>
-      <manifest file="${manifest.file}">
-        <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="org.apache.lucene"/>
-		<!-- impl version can be any string -->
-		<attribute name="Implementation-Version"
-		           value="${version} ${svnversion} - ${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>
+      <xmlproperty file="${ant.file}" collapseAttributes="true" prefix="bnd"/>
+      <property name="bndclasspath" refid="classpath"/>
+  	  <taskdef resource="aQute/bnd/ant/taskdef.properties" /> 
+  	  <mkdir dir="@{bndtempDir}"/>
+  	  <bnd 
+  	      classpath="${bndclasspath}" 
+  	      eclipse="false" 
+  	      failok="false" 
+  	      exceptions="true"
+  	      files="${common.dir}/lucene.bnd" 
+  	      output="@{bndtempDir}/${final.name}-temp.jar" /> 
+  	  <copy todir="${common.dir}/build" flatten="true">
+  	      <resources>
+  	          <url url="jar:file://@{bndtempDir}/${final.name}-temp.jar!/META-INF/MANIFEST.MF"/>
+  	      </resources>
+  	  </copy>
   	</sequential>
   </macrodef>
 	
Index: solr/common-build.xml
===================================================================
--- solr/common-build.xml	(revision 1143444)
+++ solr/common-build.xml	(working copy)
@@ -283,6 +283,7 @@
     <attribute name="classpathref" />
     <element name="nested" optional="true" implicit="true" />
     <sequential>
+      <property name="bndclasspath" refid="@{classpathref}"/>
       <mkdir dir="@{destdir}" />
       <javac destdir="@{destdir}"
              target="${java.compat.version}"
@@ -300,6 +301,7 @@
 
   <!-- Macro for building Jars -->
   <macrodef name="solr-jar">
+  	<attribute name="bndtempDir" default="${common-solr.dir}/build/temp"/>
     <attribute name="destfile" />
     <attribute name="basedir" default="." />
     <attribute name="includes" default="org/apache/**" />
@@ -307,6 +309,21 @@
     <attribute name="manifest" default="${common-solr.dir}/${dest}/META-INF/MANIFEST.MF" />
     <element name="nested" optional="true" implicit="true" />
     <sequential>
+      <xmlproperty file="${ant.file}" collapseAttributes="true" prefix="bnd"/>
+   	  <taskdef resource="aQute/bnd/ant/taskdef.properties" /> 
+   	  <mkdir dir="@{bndtempDir}"/>
+   	  <bnd 
+   	         classpath="${bndclasspath}" 
+   	         eclipse="false" 
+   	         failok="false" 
+   	         exceptions="true"
+   	         files="${common-solr.dir}/lucene.bnd" 
+   	         output="@{bndtempDir}/${fullnamever}-temp.jar" /> 
+   	  <copy todir="${common-solr.dir}/${dest}/META-INF" flatten="true">
+   	      <resources>
+   	          <url url="jar:file://@{bndtempDir}/${fullnamever}-temp.jar!/META-INF/MANIFEST.MF"/>
+   	      </resources>
+   	  </copy>
       <jar destfile="@{destfile}"
            basedir="@{basedir}"
            includes="@{includes}"
Index: solr/lucene.bnd
===================================================================
--- solr/lucene.bnd	(revision 0)
+++ solr/lucene.bnd	(revision 0)
@@ -0,0 +1,17 @@
+Export-Package: *;-split-package:=merge-first
+Extension-Name: org.apache.solr
+Specification-Title: Apache Solr Search Server
+Specification-Version: ${specversion}
+Specification-Vendor: The Apache Software Foundation
+Implementation-Title: org.apache.solr
+Implementation-Version: ${version} ${svnversion} - ${user.name} - ${DSTAMP} ${TSTAMP}
+Implementation-Vendor: The Apache Software Foundation
+X-Compile-Source-JDK: ${java.compat.version}
+X-Compile-Target-JDK: ${java.compat.version}
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-SymbolicName: org.apache.solr.${name}
+Bundle-Name: Apache Solr Search Server: ${ant.project.name}
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: ${version}
+Bundle-Description: ${bnd.project.description}
+Bundle-DocUR: http://www.apache.org/
\ No newline at end of file