diff --git a/intrace.ecl.feature/feature.xml b/intrace.ecl.feature/feature.xml
index 6a13599..b0ffcd0 100644
--- a/intrace.ecl.feature/feature.xml
+++ b/intrace.ecl.feature/feature.xml
@@ -20,7 +20,6 @@
          id="intrace.ecl"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/intrace.ecl.plugin/META-INF/MANIFEST.MF b/intrace.ecl.plugin/META-INF/MANIFEST.MF
index 9b2ccfa..5c614ec 100644
--- a/intrace.ecl.plugin/META-INF/MANIFEST.MF
+++ b/intrace.ecl.plugin/META-INF/MANIFEST.MF
@@ -8,13 +8,16 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
- org.eclipse.jdt.debug.ui;bundle-version="3.5.2",
- org.eclipse.jdt.launching;bundle-version="3.5.200",
- org.eclipse.ui.ide;bundle-version="3.6.2",
- org.eclipse.jdt.junit;bundle-version="3.6.1",
- org.eclipse.jdt.core;bundle-version="3.6.2"
+ org.eclipse.jdt.debug.ui,
+ org.eclipse.jdt.launching,
+ org.eclipse.ui.ide,
+ org.eclipse.jdt.junit,
+ org.eclipse.jdt.core
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: lib/miglayout-3.7.3.1-swt.jar,
  .,
  lib/intrace-ui-helper.jar
+Export-Package: intrace.ecl,
+ intrace.ecl.plugin.ui.output,
+ intrace.ecl.ui.launching
diff --git a/intrace.ecl.plugin/build.properties b/intrace.ecl.plugin/build.properties
index 67c3d68..9888835 100644
--- a/intrace.ecl.plugin/build.properties
+++ b/intrace.ecl.plugin/build.properties
@@ -5,4 +5,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                lib/intrace-agent.jar,\
                lib/miglayout-3.7.3.1-swt.jar,\
-               lib/intrace-ui-helper.jar
+               lib/intrace-ui-helper.jar,\
+               icons/