diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index b331369c81..2579332a4e 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -25,6 +25,7 @@
     <feature>artemis-stomp</feature>
     <feature>artemis-mqtt</feature>
     <feature>artemis-hornetq</feature>
+    <feature>artemis-openwire</feature>
   </feature>
 
 	<feature name="netty-core" version="${netty.version}" description="Netty libraries">
@@ -84,4 +85,11 @@
 		<bundle>mvn:org.apache.activemq/artemis-hornetq-protocol/${pom.version}</bundle>
 	</feature>
 
+	<feature name="artemis-openwire" version="${pom.version}" description="ActiveMQ Artemis HornetQ protocol libraries">
+		<feature>artemis-core</feature>
+		<bundle>mvn:org.fusesource.hawtbuf/hawtbuf/1.11</bundle>
+		<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+		<bundle>mvn:org.apache.activemq/artemis-openwire-protocol/${pom.version}</bundle>
+	</feature>
+
 </features>
\ No newline at end of file
diff --git a/artemis-protocols/artemis-openwire-protocol/pom.xml b/artemis-protocols/artemis-openwire-protocol/pom.xml
index 2aece8d833..2bd25cb413 100644
--- a/artemis-protocols/artemis-openwire-protocol/pom.xml
+++ b/artemis-protocols/artemis-openwire-protocol/pom.xml
@@ -65,4 +65,27 @@
    </dependencies>
 
    <packaging>bundle</packaging>
+
+   <build>
+      <plugins>
+
+         <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <version>3.0.0</version>
+            <extensions>true</extensions>
+            <configuration>
+               <instructions>
+                  <Embed-Dependency>activemq-client</Embed-Dependency>
+                  <Import-Package>
+                     !org.apache.commons.net.ftp,
+                     !javax.jmdns,
+                     javax.jms;version="[2,3)",
+                     *
+                  </Import-Package>
+               </instructions>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
 </project>