diff --git a/bundles/org.eclipse.uomo.business/build.properties b/bundles/org.eclipse.uomo.business/build.properties
index 01949b5..2bd44c4 100644
--- a/bundles/org.eclipse.uomo.business/build.properties
+++ b/bundles/org.eclipse.uomo.business/build.properties
@@ -1,4 +1,5 @@
 source.. = src/main/java/
 bin.includes = META-INF/,\
                .,\
-               lib/icu4j-50_1_1.jar
+               lib/icu4j-50_1_1.jar,\
+               lib/unit-api-0.6.1.jar
diff --git a/bundles/org.eclipse.uomo.core/.classpath b/bundles/org.eclipse.uomo.core/.classpath
index 77a3a33..ec4c491 100644
--- a/bundles/org.eclipse.uomo.core/.classpath
+++ b/bundles/org.eclipse.uomo.core/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="libs/icu4j-50_1_1.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/unit-api-0.6.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
diff --git a/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF
index ac12ead..a9686d6 100644
--- a/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.core/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@
 Bundle-DocURL: http://www.eclipse.org
 Include-Resource: src/main/resources
 Originally-Created-By: 1.6.0_23-ea(SunMicrosystemsInc.)
-Bundle-ClassPath: org.eclipse.uomo.core/libs/icu4j-50_1_1.jar,
+Bundle-ClassPath: libs/icu4j-50_1_1.jar,
  libs/unit-api-0.6.1.jar,
  .
 
diff --git a/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF
index 56e4cc7..24f4234 100644
--- a/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.units/META-INF/MANIFEST.MF
@@ -10,22 +10,16 @@
  org.osgi.util.tracker;version="1.3.1"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.uomo.units,
- org.eclipse.uomo.units.impl;
-  uses:="org.unitsofmeasurement.unit,
-   org.eclipse.uomo.units",
- org.eclipse.uomo.units.impl.converter;
-  uses:="org.unitsofmeasurement.unit,
-   org.eclipse.uomo.units",
+ org.eclipse.uomo.units.impl;uses:="org.eclipse.uomo.units",
+ org.eclipse.uomo.units.impl.converter;uses:="org.eclipse.uomo.units",
  org.eclipse.uomo.units.impl.format,
  org.eclipse.uomo.units.impl.quantity;
   uses:="org.eclipse.uomo.units.impl,
-   org.unitsofmeasurement.quantity,
-   org.unitsofmeasurement.unit,
    org.eclipse.uomo.units",
- org.eclipse.uomo.units.impl.system;
-  uses:="org.unitsofmeasurement.unit,
-   org.eclipse.uomo.units,
-   org.unitsofmeasurement.service"
+ org.eclipse.uomo.units.impl.system;uses:="org.eclipse.uomo.units",
+ org.unitsofmeasurement.quantity;version:="0.6.1",
+ org.unitsofmeasurement.service;version:="0.6.1",
+ org.unitsofmeasurement.unit;version:="0.6.1"
 Require-Bundle: org.eclipse.uomo.core;bundle-version="0.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: libs/icu4j-50_1_1.jar,