diff --git a/features/org.eclipse.datatools.common.doc.user/feature.xml b/features/org.eclipse.datatools.common.doc.user/feature.xml
index 286e6b8..7953f81 100644
--- a/features/org.eclipse.datatools.common.doc.user/feature.xml
+++ b/features/org.eclipse.datatools.common.doc.user/feature.xml
@@ -3,7 +3,7 @@
 <feature
       id="org.eclipse.datatools.common.doc.user"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.datatools.common.doc.user"
       image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.datatools.connectivity.doc.user/feature.xml b/features/org.eclipse.datatools.connectivity.doc.user/feature.xml
index d4b43eb..1707996 100644
--- a/features/org.eclipse.datatools.connectivity.doc.user/feature.xml
+++ b/features/org.eclipse.datatools.connectivity.doc.user/feature.xml
@@ -3,7 +3,7 @@
 <feature
       id="org.eclipse.datatools.connectivity.doc.user"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.datatools.connectivity.doc.user"
       image="eclipse_update_120.jpg">
@@ -12,14 +12,14 @@
       %description
    </description>
 
-   <license url="%licenseURL">
-      %license
-   </license>
-   
    <copyright>
       %copyright
    </copyright>
-   
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
    <url>
       <update label="Data Tools Platform (DTP) Updates" url="http://download.eclipse.org/datatools/updates"/>
       <discovery label="Data Tools Platform (DTP) Updates" url="http://download.eclipse.org/datatools/updates"/>
diff --git a/features/org.eclipse.datatools.connectivity.feature/feature.xml b/features/org.eclipse.datatools.connectivity.feature/feature.xml
index 05a34bb..1a949ff 100644
--- a/features/org.eclipse.datatools.connectivity.feature/feature.xml
+++ b/features/org.eclipse.datatools.connectivity.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.connectivity.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.datatools.connectivity"
       image="eclipse_update_120.jpg">
@@ -31,7 +31,7 @@
          optional="true"/>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.connectivity.oda.designer.feature/feature.xml b/features/org.eclipse.datatools.connectivity.oda.designer.feature/feature.xml
index fbb80d3..51d9472 100644
--- a/features/org.eclipse.datatools.connectivity.oda.designer.feature/feature.xml
+++ b/features/org.eclipse.datatools.connectivity.oda.designer.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.connectivity.oda.designer.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.datatools.connectivity.oda.design.ui"
       image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.datatools.enablement.apache.derby.feature/feature.xml b/features/org.eclipse.datatools.enablement.apache.derby.feature/feature.xml
index a410710..b087139 100644
--- a/features/org.eclipse.datatools.enablement.apache.derby.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.apache.derby.feature/feature.xml
@@ -25,9 +25,9 @@
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.6.0"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.6.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin