diff --git a/sigil/bldcommon/ivysettings.xml b/sigil/bldcommon/ivysettings.xml
index 7704355..69a6bc2 100644
--- a/sigil/bldcommon/ivysettings.xml
+++ b/sigil/bldcommon/ivysettings.xml
@@ -65,11 +65,6 @@
       <artifact pattern="http://download.eclipse.org/releases/ganymede/[module].[artifact]_[revision].[ext]" />
     </url>
 
-    <url name="eclipse2" cache="eclipse2" >
-      <artifact pattern="http://download.eclipse.org/releases/ganymede/plugins/[module]_[revision].[ext]" />
-      <artifact pattern="http://download.eclipse.org/releases/ganymede/[module].[artifact]_[revision].[ext]" />
-    </url>
-
     <url name="apache" m2compatible="true">
       <artifact pattern="http://repo1.maven.org/maven2/[organisation]/[module]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
       <artifact pattern="http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
@@ -82,13 +77,11 @@
 
   <caches>
     <cache name="sigil" basedir="${cache.dir}/sigil" />
-    <cache name="eclipse2" basedir="${cache.dir}/eclipse2" />
   </caches>
 
   <modules>
     <module organisation="sigil" resolver="sigil"/>
     <module organisation="org.eclipse" resolver="eclipse"/>
-    <module organisation="org.eclipse2" resolver="eclipse2"/>
     <module organisation="org.apache" name="felix\.sigil.*" matcher="regexp" resolver="default"/>
     <module organisation="org.apache" resolver="apache"/>
     <module organisation="biz.aQute" resolver="aQute"/>
diff --git a/sigil/bldcommon/prepare/ivy.xml b/sigil/bldcommon/prepare/ivy.xml
index 4a6f307..1cf8b33 100644
--- a/sigil/bldcommon/prepare/ivy.xml
+++ b/sigil/bldcommon/prepare/ivy.xml
@@ -51,12 +51,12 @@
         <dependency org="org.eclipse" name="org.eclipse.zest.core" rev="1.0.0.v20080115" />
         <dependency org="org.eclipse" name="org.eclipse.zest.layouts" rev="1.0.0.v20080226" />
 	<!-- fragments -->
-        <dependency org="org.eclipse2" name="org.eclipse.core.runtime" rev="3.4.0.v20080512" />
-        <dependency org="org.eclipse2" name="org.eclipse.equinox.preferences" rev="3.2.201.R34x_v20080709" />
-        <dependency org="org.eclipse2" name="org.eclipse.equinox.registry" rev="3.4.0.v20080516-0950" />
-        <dependency org="org.eclipse2" name="org.eclipse.swt" rev="3.4.2.v3452b" />
-        <dependency org="org.eclipse2" name="org.eclipse.text" rev="3.4.0.v20080605-1800" />
-        <dependency org="org.eclipse2" name="org.eclipse.ui.workbench.texteditor" rev="3.4.1.r341_v20080827-1100" />
+        <dependency org="org.eclipse" name="org.eclipse.core.runtime" rev="3.4.0.v20080512" />
+        <dependency org="org.eclipse" name="org.eclipse.equinox.preferences" rev="3.2.201.R34x_v20080709" />
+        <dependency org="org.eclipse" name="org.eclipse.equinox.registry" rev="3.4.0.v20080516-0950" />
+        <dependency org="org.eclipse" name="org.eclipse.swt" rev="3.4.2.v3452b" />
+        <dependency org="org.eclipse" name="org.eclipse.text" rev="3.4.0.v20080605-1800" />
+        <dependency org="org.eclipse" name="org.eclipse.ui.workbench.texteditor" rev="3.4.1.r341_v20080827-1100" />
 
         <dependency org="org.apache" name="bcel" rev="5.2">
           <artifact name="bcel" type="jar" />
diff --git a/sigil/bldcommon/sigil-repos.properties b/sigil/bldcommon/sigil-repos.properties
index 1da7324..b458ff4 100644
--- a/sigil/bldcommon/sigil-repos.properties
+++ b/sigil/bldcommon/sigil-repos.properties
@@ -2,7 +2,7 @@
 
 # repository config
 
--repositories:  system, project, bld-ant, bld-common, bld-hack, felix, spring
+-repositories:  system, project, bld-ant, bld-common, felix, spring
 
 system;provider:        system
 system;level:           -1
@@ -23,11 +23,6 @@
 bld-common;recurse:	true
 bld-common;dir:		${cache.dir:-${..}/cache}/all
 
-bld-hack;provider:	filesystem
-bld-hack;level:		3
-bld-hack;recurse:	true
-bld-hack;dir:		${cache.dir:-${..}/cache}/eclipse2
-
 felix;provider:	obr
 felix;level:		4
 felix;url:              http://felix.apache.org/obr/releases.xml 
diff --git a/sigil/common/core/sigil.properties b/sigil/common/core/sigil.properties
index 086b1c3..4d52aab 100644
--- a/sigil/common/core/sigil.properties
+++ b/sigil/common/core/sigil.properties
@@ -56,6 +56,9 @@
 	org.eclipse.core.runtime, \
 	org.osgi.framework, \
 
+-requires: \
+	org.eclipse.equinox.common;version=3.4.0, \
+
 header;Bundle-ActivationPolicy: lazy
 
 # end
diff --git a/sigil/eclipse/utils/sigil.properties b/sigil/eclipse/utils/sigil.properties
index 8862d79..b5b9726 100644
--- a/sigil/eclipse/utils/sigil.properties
+++ b/sigil/eclipse/utils/sigil.properties
@@ -26,6 +26,7 @@
 	org.eclipse.ui, \
 
 -requires: \
+        org.eclipse.equinox.common;version=3.4.0, \
 	org.eclipse.core.runtime;version=3.4.0, \
 	org.eclipse.ui.ide;version=3.4.2, \
 	org.eclipse.ui.workbench;version=3.4.1, \