diff --git a/plexus-java-build.xml b/plexus-java-build.xml
index b38387a..3e178ae 100644
--- a/plexus-java-build.xml
+++ b/plexus-java-build.xml
@@ -19,8 +19,6 @@
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
-  <property name="build.outputDir9" value="${build.outputDir}/META-INF/versions/9"/>
-  <property name="build.srcDir9" value="src/main/java9"/>
   <property name="build.resourceDir" value="src/main/resources"/>
   <property name="build.testOutputDir" value="${build.dir}/test-classes"/>
   <property name="build.testDir" value="src/test/java"/>
@@ -82,6 +80,28 @@
     </copy>
   </target>
 
+  <!-- ====================================================================== -->
+  <!-- Sisu javax.inject.Named generation target                              -->
+  <!-- ====================================================================== -->
+
+  <target name="sisu"
+          depends="compile"
+          description="Generate javax.inject.Name index">
+    <sequential>
+	  <java classname="org.eclipse.sisu.space.SisuIndex"
+	        failonerror="true"
+			fork="true">
+        <classpath>
+          <path refid="build.classpath"/>
+        </classpath>
+        <arg value="${build.outputDir}"/>
+      </java>
+      <move todir="${build.outputDir}/META-INF">
+        <fileset dir="META-INF"/>
+      </move>
+	</sequential>
+  </target>
+
   <!-- ====================================================================== -->
   <!-- Test-compilation target                                                -->
   <!-- ====================================================================== -->
@@ -210,7 +230,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile,test" description="Package the application">
+  <target name="package" depends="sisu,test" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"
diff --git a/plexus-languages.spec b/plexus-languages.spec
index ba70827..2a04b12 100644
--- a/plexus-languages.spec
+++ b/plexus-languages.spec
@@ -37,6 +37,7 @@ BuildRequires:  javapackages-local
 BuildRequires:  objectweb-asm
 BuildRequires:  plexus-containers-component-annotations
 BuildRequires:  qdox >= 2
+BuildRequires:  sisu-inject
 Requires:       java >= 1.7
 Requires:       mvn(com.thoughtworks.qdox:qdox)
 Requires:       mvn(org.ow2.asm:asm)
@@ -65,7 +66,7 @@ cp %{SOURCE100} plexus-java/build.xml
 
 %build
 mkdir -p lib
-build-jar-repository -s lib qdox javax.inject plexus-containers/plexus-component-annotations objectweb-asm/asm
+build-jar-repository -s lib qdox javax.inject plexus-containers/plexus-component-annotations objectweb-asm/asm atinject org.eclipse.sisu.inject
 pushd plexus-java
 %{ant} -Dtest.skip=true package javadoc
 popd