diff --git a/org.eclipse.mylyn.docs.epub-feature/feature.xml b/org.eclipse.mylyn.docs.epub-feature/feature.xml
index 9d98553..b2c15e4 100644
--- a/org.eclipse.mylyn.docs.epub-feature/feature.xml
+++ b/org.eclipse.mylyn.docs.epub-feature/feature.xml
@@ -19,27 +19,20 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.validation" version="1.4.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.wikitext.core" version="1.4.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.mapping.ecore2xml" version="2.7.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.docs.epub.core" version="0.8.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.wikitext.ui" version="1.5.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.wikitext.core" version="1.5.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.core.databinding"/>
-      <import plugin="org.eclipse.core.databinding.beans"/>
-      <import plugin="org.eclipse.core.databinding.observable"/>
-      <import plugin="org.eclipse.core.databinding.property"/>
-      <import plugin="org.eclipse.jface.databinding"/>
-      <import plugin="com.ibm.icu"/>
-      <import plugin="org.eclipse.emf" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.databinding"/>
-      <import plugin="org.eclipse.emf.validation" version="1.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.validation.ui" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.mylyn.wikitext.core" version="1.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.mylyn.docs.epub.core" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.mylyn.wikitext.ui" version="1.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.6.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.databinding" version="1.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.databinding.beans" version="1.2.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface.databinding" version="1.5.0" match="greaterOrEqual"/>
+      <import plugin="org.apache.ant" version="1.8.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ant.core" version="3.2.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.common" version="2.7.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.ecore.xmi" version="2.7.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF
index 244c481..090493c 100644
--- a/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.docs.epub.ant.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.mylyn.docs.epub.ant;x-internal:=true,
  org.eclipse.mylyn.docs.epub.ant.core;x-internal:=true;uses:="org.eclipse.mylyn.docs.epub,org.apache.tools.ant.types,org.apache.tools.ant"
-Require-Bundle: org.apache.ant;bundle-version="[1.8.2,2.0.0)",
- org.eclipse.mylyn.docs.epub.core;bundle-version="[0.8.0,1.0.0)",
- org.eclipse.ant.core;bundle-version="3.2.300"
+Require-Bundle: org.apache.ant;bundle-version="1.8.2",
+ org.eclipse.ant.core;bundle-version="3.2.300",
+ org.eclipse.mylyn.docs.epub.core;bundle-version="0.8.0"
 Bundle-ClassPath: .
diff --git a/org.eclipse.mylyn.docs.epub.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs.epub.core/META-INF/MANIFEST.MF
index 8891462..a17d19c 100644
--- a/org.eclipse.mylyn.docs.epub.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.docs.epub.core/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@
 Bundle-Version: 0.8.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.validation;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.mylyn.wikitext.core;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.mapping.ecore2xml;bundle-version="[2.7.0,3.0.0)"
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.emf.common;bundle-version="2.7.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.7.0",
+ org.eclipse.mylyn.wikitext.core;bundle-version="1.5.0"
 Export-Package: org.eclipse.mylyn.docs.epub.core;uses:="org.eclipse.mylyn.docs.epub.dc,org.eclipse.mylyn.docs.epub.opf,org.eclipse.mylyn.docs.epub.ncx",
  org.eclipse.mylyn.docs.epub.core.wikitext,
  org.eclipse.mylyn.docs.epub.dc;uses:="org.eclipse.emf.ecore.util,org.eclipse.emf.ecore,org.eclipse.mylyn.docs.epub.opf",
diff --git a/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
index 4de12cc..db7cc3d 100644
--- a/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.docs.epub.help/META-INF/MANIFEST.MF
@@ -5,5 +5,3 @@
 Bundle-Version: 0.8.0.qualifier
 Bundle-Vendor: Torkild U. Resheim
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.mylyn.docs.epub.core;bundle-version="0.8.0",
- org.eclipse.mylyn.docs.epub.ant.core;bundle-version="0.8.0"
diff --git a/org.eclipse.mylyn.docs.epub.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs.epub.tests/META-INF/MANIFEST.MF
index 2ae722e..328acf3 100644
--- a/org.eclipse.mylyn.docs.epub.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.docs.epub.tests/META-INF/MANIFEST.MF
@@ -5,17 +5,11 @@
 Bundle-Version: 0.8.0.qualifier
 Bundle-Vendor: Torkild U. Resheim
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.databinding.edit,
- org.eclipse.emf.ecore.change.edit,
- org.eclipse.emf.ecore.editor,
- org.eclipse.emf.exporter,
- org.eclipse.emf.importer,
- org.eclipse.emf.mapping.ecore2ecore.editor,
- org.eclipse.emf.mapping.ecore2xml.ui,
- org.junit,
+Require-Bundle: org.junit,
  org.apache.ant;bundle-version="1.8.2",
- org.eclipse.mylyn.docs.epub.core,
- org.apache.ant.source;bundle-version="1.8.2"
+ org.apache.ant.source;bundle-version="1.8.2",
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.mylyn.docs.epub.core;bundle-version="0.8.0"
 Bundle-ClassPath: .,
  epubcheck/epubcheck-1.2.jar,
  epubcheck/lib/jing.jar,
diff --git a/org.eclipse.mylyn.docs.epub.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs.epub.ui/META-INF/MANIFEST.MF
index 774f74c..30517b8 100644
--- a/org.eclipse.mylyn.docs.epub.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.docs.epub.ui/META-INF/MANIFEST.MF
@@ -5,22 +5,16 @@
 Bundle-Version: 0.8.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.mylyn.docs.epub.core;bundle-version="[0.8.0,1.0.0)",
- org.eclipse.mylyn.wikitext.ui;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.mylyn.wikitext.core;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.core.databinding,
- org.eclipse.core.databinding.beans,
- org.eclipse.core.databinding.observable,
- org.eclipse.core.databinding.property,
- org.eclipse.jface.databinding,
- com.ibm.icu,
- org.eclipse.emf.ecore;bundle-version="2.5.0",
- org.eclipse.emf.databinding,
- org.eclipse.emf.validation,
- org.eclipse.emf.validation.ui
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.eclipse.mylyn.docs.epub.core;bundle-version="0.8.0",
+ org.eclipse.mylyn.wikitext.ui;bundle-version="1.5.0",
+ org.eclipse.mylyn.wikitext.core;bundle-version="1.5.0",
+ org.eclipse.core.resources;bundle-version="3.5.0",
+ org.eclipse.ui;bundle-version="3.5.0",
+ org.eclipse.core.databinding;bundle-version="1.4.0",
+ org.eclipse.core.databinding.beans;bundle-version="1.2.100",
+ org.eclipse.jface.databinding;bundle-version="1.5.0",
+ org.eclipse.emf.ecore;bundle-version="2.7.0"
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.mylyn.internal.docs.epub.ui.EPUBUIPlugin
 Bundle-ActivationPolicy: lazy