diff --git a/ChangeLog.txt b/ChangeLog.txt
index cc38699df..f9e059eb1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,5 @@
 Version 0.18-SNAPSHOT:
+   [feature] Generate correct MANIFEST.MF with bnd-maven-plugin. (#848)
    [feature] Flow-control: implemented publish's quota management on the server side. (#852)
    [fix] Incorrect reference used in compareAndSet in CTrie.cleanTomb. (#841)
    [feature] Implement response-information property for request-response flow. (#840)
diff --git a/broker/bnd.bnd b/broker/bnd.bnd
new file mode 100644
index 000000000..65d6e7cd6
--- /dev/null
+++ b/broker/bnd.bnd
@@ -0,0 +1,10 @@
+Bundle-Version: 0.18.0.${tstamp}
+Export-Package: io.moquette.*
+
+Import-Package: \
+    com.bugsnag;'resolution:'=optional, \
+    com.codahale.metrics;'resolution:'=optional, \
+    com.librato.metrics.*;'resolution:'=optional, \
+    com.zaxxer.hikari.*;'resolution:'=optional, \
+    org.apache.commons.codec.*;'resolution:'=optional, \
+    *
diff --git a/pom.xml b/pom.xml
index a40363840..9a58cc79f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,8 +159,27 @@
                     </execution>
                   </executions>
                 </plugin>
+                <plugin>
+                    <groupId>biz.aQute.bnd</groupId>
+                    <artifactId>bnd-maven-plugin</artifactId>
+                    <version>6.4.0</version>
+                    <extensions>true</extensions>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>