diff --git a/org.apache.felix.shell/pom.xml b/org.apache.felix.shell/pom.xml
index 0f2f517..17470cf 100644
--- a/org.apache.felix.shell/pom.xml
+++ b/org.apache.felix.shell/pom.xml
@@ -5,7 +5,7 @@
     <version>0.8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>jar</packaging>
+  <packaging>osgi-bundle</packaging>
   <name>Apache Felix Shell Service</name>
   <artifactId>org.apache.felix.shell</artifactId>
   <dependencies>
@@ -13,17 +13,29 @@
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi</artifactId>
       <version>${pom.version}</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <version>${pom.version}</version>
+        <extensions>true</extensions>
         <configuration>
-          <archive>
-            <manifestFile>src/main/resources/Manifest.mf</manifestFile>
-          </archive>
+          <osgiManifest>
+            <bundleName>ShellService</bundleName>
+            <bundleDescription>A simple command shell service for Felix (or any other OSGi framework).</bundleDescription>
+            <bundleActivator>org.apache.felix.shell.impl.Activator</bundleActivator>
+            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/shell/</bundleDocUrl>
+            <bundleSource>http://oscar-osgi.sf.net/obr2/shell/org.apache.felix.shell.impl-src.jar</bundleSource>
+            <bundleSymbolicName>org.apache.felix.shell.impl</bundleSymbolicName>
+            <importPackage>org.osgi.framework, org.osgi.service.startlevel, org.osgi.service.packageadmin</importPackage>
+            <exportPackage>org.apache.felix.shell; specification-version="1.0.0", org.ungoverned.osgi.service.shell; specification-version="1.0.0"</exportPackage>
+            <exportService>org.apache.felix.shell.ShellService, org.ungoverned.osgi.service.shell.ShellService</exportService>
+            <importService>org.osgi.service.startlevel.StartLevel, org.osgi.service.packageadmin.PackageAdmin</importService>
+          </osgiManifest>
         </configuration>
       </plugin>
     </plugins>