diff --git a/.gitignore b/.gitignore
index 6f63cb31..69b3cb48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,10 @@
 *.iml
 broker/target/
 client/target/
-/parser_commons/target/netty_parser/target/
+parser_commons/target/
+netty_parser/target/
 netty_parser/target/
 parser_commons/target/
-/distribution/target/
\ No newline at end of file
+distribution/target/
+broker/moquette.log
+broker/runner
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9ac9441b..83f21709 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,7 +1,9 @@
 Version 0.5:
     Fix issue 20 (no flush of message on PINGREQ)
     Fix issue 21 (bad channel timeout handler)
-
+    Created a self contained distribution package (issue 22)
+    Fix issue 28, OSGi-fied the broker
+    
 Version 0.4:
     Dropped support for MINA
     Fix Issue 15 (bad re-activation of client's subscriptions after a recconection)
diff --git a/broker/pom.xml b/broker/pom.xml
index dd547ca0..836769ca 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>moquette-broker</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <!--<version>${moquette-version}</version>-->
     <name>Moquette - broker</name>
 
@@ -41,20 +41,84 @@
         
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-api</artifactId>
             <version>1.7.5</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
-            <groupId>org.fusesource.hawtdb</groupId>
-            <artifactId>hawtdb</artifactId>
-            <version>1.6</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.5</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        
+        <!-- Included to embedded an HawtDB dependency, we host commons-logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.fusesource.hawtbuf</groupId>
             <artifactId>hawtbuf</artifactId>
             <version>1.9</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.fusesource.hawtdb</groupId>
+            <artifactId>hawtdb</artifactId>
+            <version>1.6</version>
+            <scope>provided</scope>
         </dependency>
                 
         <dependency>
@@ -107,6 +171,46 @@
                     </includes>
                 </configuration>
             </plugin>
+            
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.1.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.dna.mqtt.commons, 
+                            org.apache.commons.logging,
+                            org.dna.mqtt.moquette.messaging.spi.impl.storage,
+                            org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,
+                            org.dna.mqtt.moquette.proto.messages,
+                            org.dna.mqtt.moquette.server.netty.metrics
+                        </Export-Package>
+                        <Private-Package>org.dna.mqtt.moquette.bundle,
+                            ${project.groupId}.*,
+                            com.lmax.*
+                        </Private-Package>
+                        <Import-Package>*</Import-Package>
+                        <Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <!-- Pax Runner Maven plugin -->
+                <groupId>org.ops4j</groupId>
+                <artifactId>maven-pax-plugin</artifactId>
+                <version>1.4</version>
+                <configuration>
+                    <!-- Pax Runner version -->
+                    <runner>1.4.0</runner>
+                    <!-- OSGi framework type (equinox, felix, knopflerfish) -->
+                    <framework>equinox</framework>
+                    <provision>
+                        <!--                        <param> - -log=debug</param>  
+                        <param> - -workingDirectory=target/runner</param>  -->
+                    </provision>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java b/broker/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
new file mode 100644
index 00000000..b44f9b2b
--- /dev/null
+++ b/broker/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
@@ -0,0 +1,30 @@
+package org.dna.mqtt.moquette.bundle;
+
+import org.dna.mqtt.moquette.server.Server;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Start and stop a configured version of the MQTT broker server.
+ *
+ * @author Didier Donsez
+ * @todo add config admin for port (in NettyAcceptor)
+ */
+public class Activator implements BundleActivator {
+
+    private static final Logger LOG = LoggerFactory.getLogger(Server.class);
+    private Server server = null;
+
+    public void start(BundleContext bundleContext) throws Exception {
+        server = new Server();
+        server.startServer();
+        LOG.info("Moquette MQTT broker started, version 0.5-SNAPSHOT");
+    }
+
+    public void stop(BundleContext bundleContext) throws Exception {
+        server.stopServer();
+        LOG.info("Moquette MQTT broker stopped, version 0.5-SNAPSHOT");
+    }
+}