diff --git a/cdi-api-build.xml b/cdi-api-build.xml
index d72cde7..8034b0c 100644
--- a/cdi-api-build.xml
+++ b/cdi-api-build.xml
@@ -125,10 +125,10 @@
 		<attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/>
 		<attribute name="Bundle-Vendor" value="${project.organization.name}"/>
 		<attribute name="Bundle-Version" value="${bundle.version}"/>
-		<attribute name="Export-Package" value="javax.decorator;version=&quot;1.1&quot;;uses:=&quot;javax.enterprise.inject&quot;,javax.enterprise.event;version=&quot;1.1&quot;;uses:=&quot;javax.enterprise.util&quot;,javax.enterprise.inject;version=&quot;1.1&quot;;uses:=&quot;javax.enterprise.util,javax.inject&quot;,javax.enterprise.util;version=&quot;1.1&quot;"/>
+		<attribute name="Export-Package" value="javax.decorator;version=&quot;1.1&quot;;uses:=&quot;javax.enterprise.inject&quot;,javax.enterprise.context;version=&quot;1.1&quot;;uses:=&quot;javax.inject&quot;,javax.enterprise.context.spi;version=&quot;1.1&quot;,javax.enterprise.event;version=&quot;1.1&quot;;uses:=&quot;javax.enterprise.util&quot;,javax.enterprise.inject;version=&quot;1.1&quot;;uses:=&quot;javax.enterprise.context,javax.enterprise.util,javax.inject&quot;,javax.enterprise.inject.spi;version=&quot;1.1&quot;;uses:=&quot;javax.el,javax.enterprise.context.spi,javax.enterprise.event,javax.enterprise.inject,javax.interceptor&quot;,javax.enterprise.util;version=&quot;1.1&quot;"/>
 		<attribute name="Implementation-Title" value="${project.name}"/>
 		<attribute name="Implementation-Version" value="${project.version}"/>
-		<attribute name="Import-Package" value="javax.enterprise.inject;version=&quot;[1.1,2)&quot;,javax.enterprise.util;version=&quot;[1.1,2)&quot;,javax.inject;version=&quot;[1.0,2)&quot;"/>
+		<attribute name="Import-Package" value="javax.enterprise.context;version=&quot;[1.1,2)&quot;,javax.enterprise.context.spi;version=&quot;[1.1,2)&quot;,javax.enterprise.event;version=&quot;[1.1,2)&quot;,javax.enterprise.inject;version=&quot;[1.1,2)&quot;,javax.enterprise.util;version=&quot;[1.1,2)&quot;,javax.inject;version=&quot;[1.0,2)&quot;,javax.interceptor;version=&quot;[${project.version},2)&quot;"/>
 		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
 		<attribute name="Specification-Title" value="${spec.title}"/>
 		<attribute name="Specification-Version" value="${spec.version}"/>
diff --git a/cdi-api.spec b/cdi-api.spec
index b43a4da..34838bc 100644
--- a/cdi-api.spec
+++ b/cdi-api.spec
@@ -31,7 +31,9 @@ BuildRequires:  ant
 BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local
+BuildRequires:  jboss-interceptors-1.2-api
 Requires:       mvn(javax.inject:javax.inject)
+Requires:       mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec)
 BuildArch:      noarch
 
 %description
@@ -52,8 +54,9 @@ cp %{SOURCE1} build.xml
 cp %{SOURCE2} LICENSE
 
 %pom_remove_dep :javax.el-api
-%pom_remove_dep :javax.interceptor-api
-rm -rf src/main/java/javax/enterprise/{context/,inject/spi/,inject/se/,inject/Model.java,inject/New.java}
+
+# Use newer version of interceptors API
+%pom_change_dep "javax.interceptor:javax.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec"
 
 %pom_remove_parent
 popd
@@ -61,7 +64,7 @@ popd
 %build
 pushd api/
 mkdir -p lib
-build-jar-repository -s lib javax.inject
+build-jar-repository -s lib javax.inject jboss-interceptors-1.2-api
 %{ant} jar javadoc
 popd