diff --git a/sigil/bldcommon/common.xml b/sigil/bldcommon/common.xml
index 48db7e1..4bf382e 100644
--- a/sigil/bldcommon/common.xml
+++ b/sigil/bldcommon/common.xml
@@ -65,11 +65,11 @@
 			 classpath="${ivy.jar}:${sigil-ivy-plugin.jar}"/>
 	
 		<taskdef name="sigil.bundle"
-			 classname="org.cauldron.bld.ant.BundleTask"
+			 classname="org.apache.felix.sigil.ant.BundleTask"
 			 classpath="${sigil-ivy-plugin.jar}"/>
     	
     	<taskdef name="sigil.bundle.info"
-    		 classname="org.cauldron.bld.ant.BundleInfoTask"
+    		 classname="org.apache.felix.sigil.ant.BundleInfoTask"
     		 classpath="${sigil-ivy-plugin.jar}"/>
     </target>    
 	
@@ -141,8 +141,8 @@
     <target name="compile" depends="resolve"
     	description="--> compile the project">
         <!-- uncomment the following to debug classpath -->
-        <pathconvert property="cp" refid="javac.classpath"/>
-        <echo>Classpath - ${cp}</echo>
+        <!--pathconvert property="cp" refid="javac.classpath"/>
+        <echo>Classpath - ${cp}</echo-->
         <mkdir dir="${classes.dir}" />
         <javac srcdir="${src.dir}"
 		destdir="${classes.dir}"
diff --git a/sigil/bldcommon/ivysettings.xml b/sigil/bldcommon/ivysettings.xml
index 89efa40..0e16172 100644
--- a/sigil/bldcommon/ivysettings.xml
+++ b/sigil/bldcommon/ivysettings.xml
@@ -34,8 +34,8 @@
   at getting the Ivy communiuty to fix this.
   http://mail-archives.apache.org/mod_mbox/ant-dev/200810.mbox/browser
   -->
-  <typedef name="sigil-parser" classname="org.cauldron.bld.ivy.SigilParser" />
-  <typedef name="sigil" classname="org.cauldron.bld.ivy.SigilResolver" />
+  <typedef name="sigil-parser" classname="org.apache.felix.sigil.ivy.SigilParser" />
+  <typedef name="sigil" classname="org.apache.felix.sigil.ivy.SigilResolver" />
 
   <parsers>
     <sigil-parser config="${ivy.settings.dir}/sigil-repos.properties"