diff --git a/bundles/org.eclipse.rap.addons.dropdown.viewer/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.addons.dropdown.viewer/META-INF/MANIFEST.MF
index 100ded4..48ce8d5 100644
--- a/bundles/org.eclipse.rap.addons.dropdown.viewer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.addons.dropdown.viewer/META-INF/MANIFEST.MF
@@ -7,6 +7,8 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.rap.rwt;bundle-version="2.1.0",
  org.eclipse.rap.jface;bundle-version="2.1.0",
- org.eclipse.rap.addons.dropdown;bundle-version="0.1.0",
  org.eclipse.rap.clientscripting;bundle-version="0.1.100"
-Export-Package: org.eclipse.rap.addons.dropdown.viewer
+Export-Package: org.eclipse.rap.addons.dropdown.viewer;version="0.1.0"
+Import-Package: org.eclipse.rap.addons.dropdown;version="0.1.0",
+ org.eclipse.rap.addons.dropdown.internal;version="0.1.0",
+ org.eclipse.rap.addons.dropdown.internal.resources;version="0.1.0"
diff --git a/bundles/org.eclipse.rap.addons.dropdown/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.addons.dropdown/META-INF/MANIFEST.MF
index 2f05a2c..79f1ca1 100644
--- a/bundles/org.eclipse.rap.addons.dropdown/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.addons.dropdown/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
 Import-Package: org.eclipse.rap.clientscripting;version="0.1.100",
  org.eclipse.rap.clientscripting.internal;version="0.2.0",
  org.osgi.framework;version="1.3.0"
-Export-Package: org.eclipse.rap.addons.dropdown,
- org.eclipse.rap.addons.dropdown.internal,
- org.eclipse.rap.addons.dropdown.internal.resources;x-internal:=true
+Export-Package: org.eclipse.rap.addons.dropdown;version="0.1.0",
+ org.eclipse.rap.addons.dropdown.internal;version="0.1.0";x-internal:=true,
+ org.eclipse.rap.addons.dropdown.internal.resources;version="0.1.0";x-internal:=true
 Require-Bundle: org.eclipse.rap.rwt;bundle-version="2.1.0"
diff --git a/examples/org.eclipse.rap.addons.dropdown.demo.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.addons.dropdown.demo.examples/META-INF/MANIFEST.MF
index b3152b0..e52c0be 100644
--- a/examples/org.eclipse.rap.addons.dropdown.demo.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.addons.dropdown.demo.examples/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Name: DropDown Addon for Examples Demo
 Bundle-SymbolicName: org.eclipse.rap.addons.dropdown.demo.examples
 Bundle-Version: 1.0.0.qualifier
-Import-Package: org.osgi.framework;version="1.3.0"
+Import-Package: org.eclipse.rap.addons.dropdown;version="0.1.0",
+ org.eclipse.rap.addons.dropdown.viewer;version="0.1.0",
+ org.osgi.framework;version="1.3.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse.org - RAP
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="1.4.0",
- org.eclipse.rap.examples;bundle-version="1.0.0",
- org.eclipse.rap.addons.dropdown;bundle-version="0.1.0",
- org.eclipse.rap.addons.dropdown.viewer;bundle-version="0.1.0",
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="2.1.0",
+ org.eclipse.rap.examples;bundle-version="2.1.0",
  org.eclipse.rap.jface;bundle-version="2.1.0"
-Export-Package: org.eclipse.rap.addons.dropdown.demo.examples
+Export-Package: org.eclipse.rap.addons.dropdown.demo.examples;version="0.1.0"
 Bundle-Activator: org.eclipse.rap.addons.dropdown.demo.examples.Activator
diff --git a/examples/org.eclipse.rap.addons.dropdown.demo/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.addons.dropdown.demo/META-INF/MANIFEST.MF
index 4dee549..f882463 100644
--- a/examples/org.eclipse.rap.addons.dropdown.demo/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.addons.dropdown.demo/META-INF/MANIFEST.MF
@@ -6,8 +6,9 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.rap.rwt;bundle-version="2.1.0",
  org.eclipse.rap.jface;bundle-version="2.1.0",
- org.eclipse.rap.addons.dropdown;bundle-version="0.1.0",
- org.eclipse.rap.addons.dropdown.viewer;bundle-version="0.1.0",
  org.eclipse.rap.clientscripting;bundle-version="0.1.100"
 Service-Component: OSGI-INF/*.xml
 Bundle-Vendor: Eclipse.org - RAP Incubator
+Import-Package: org.eclipse.rap.addons.dropdown;version="0.1.0",
+ org.eclipse.rap.addons.dropdown.viewer;version="0.1.0"
+Export-Package: org.eclipse.rap.addons.dropdown.demo;version="0.1.0"
diff --git a/tests/org.eclipse.rap.addons.dropdown.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.addons.dropdown.test/META-INF/MANIFEST.MF
index 758a91b..0141de0 100644
--- a/tests/org.eclipse.rap.addons.dropdown.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.addons.dropdown.test/META-INF/MANIFEST.MF
@@ -10,10 +10,10 @@
  org.eclipse.rap.rwt.testfixture;bundle-version="2.1.0";resolution:=optional,
  org.eclipse.rap.addons.dropdown;bundle-version="0.1.0",
  org.eclipse.rap.addons.dropdown.viewer;bundle-version="0.1.0",
- org.junit;bundle-version="4.8.0";resolution:=optional,
- org.mockito.mockito-all;bundle-version="1.9.5";resolution:=optional,
- org.eclipse.rap.jstestrunner;bundle-version="0.1.0";resolution:=optional,
- org.eclipse.core.runtime;bundle-version="3.9.0"
+ org.junit;bundle-version="4.8.0",
+ org.mockito.mockito-all;bundle-version="1.9.5",
+ org.eclipse.rap.jstestrunner;bundle-version="0.1.0",
+ org.hamcrest;bundle-version="1.1.0"
 Import-Package: org.eclipse.rap.clientscripting;version="0.1.100",
  org.eclipse.rap.clientscripting.internal;version="0.2.0"
 Service-Component: OSGI-INF/*.xml