diff --git a/ccm-cms-assets-imagestep/application.xml b/ccm-cms-assets-imagestep/application.xml
index 1668a023f..fc5e6552d 100755
--- a/ccm-cms-assets-imagestep/application.xml
+++ b/ccm-cms-assets-imagestep/application.xml
@@ -2,8 +2,8 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-imagestep"
   prettyName="Image step"
-  version="6.6.0"
-  release="2"
+  version="6.6.1"
+  release="1"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
diff --git a/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/default/upgrade/6.6.0-6.6.1/upd_inits.sql b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/default/upgrade/6.6.0-6.6.1/upd_inits.sql
new file mode 100644
index 000000000..fde8ca34e
--- /dev/null
+++ b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/default/upgrade/6.6.0-6.6.1/upd_inits.sql
@@ -0,0 +1,22 @@
+--
+-- Copyright (C) 2010 Peter Boy. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: upd_inits.sql  $
+
+update inits
+   set class_name='com.arsdigita.cms.contentassets.ItemImageAttachmentInitializer'
+ where class_name='com.arsdigita.cms.ItemImageAttachmentInitializer' ;
\ No newline at end of file
diff --git a/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/oracle-se-6.6.0-6.6.1.sql
new file mode 100644
index 000000000..301df360d
--- /dev/null
+++ b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/oracle-se-6.6.0-6.6.1.sql
@@ -0,0 +1,4 @@
+
+PROMPT ImageStep 6.6.0 -> 6.6.1 Upgrade Script (Oracle)
+
+@@ ../default/upgrade/6.6.0-6.6.1/upd_inits.sql
diff --git a/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/postgres-6.6.0-6.6.1.sql
new file mode 100644
index 000000000..2fe31cd73
--- /dev/null
+++ b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/postgres-6.6.0-6.6.1.sql
@@ -0,0 +1,7 @@
+\echo ImageStep 6.5.0 -> 6.5.1 Upgrade Script (PostgreSQL)
+
+begin;
+
+\i ../default/upgrade/6.6.0-6.6.1/upd_inits.sql
+
+commit;
diff --git a/ccm-cms-assets-imagestep/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/ItemImageAttachment.xml b/ccm-cms-assets-imagestep/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/ItemImageAttachment.xml
index 1f7ec32eb..ef59a3058 100755
--- a/ccm-cms-assets-imagestep/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/ItemImageAttachment.xml
+++ b/ccm-cms-assets-imagestep/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/ItemImageAttachment.xml
@@ -6,7 +6,7 @@
   <!-- First off the adapters for ContentItemPanel -->
   <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
     <!-- Individual article sections -->
-    <xrd:adapter objectType="com.arsdigita.cms.contenttypes.ItemImageAttachment">
+    <xrd:adapter objectType="com.arsdigita.cms.contentassets.ItemImageAttachment">
       <xrd:attributes rule="exclude">
         <xrd:property name="/object/defaultDomainClass"/>
         <xrd:property name="/object/objectType"/>
diff --git a/ccm-cms-assets-imagestep/src/ccm-cms-assets-imagestep.upgrade b/ccm-cms-assets-imagestep/src/ccm-cms-assets-imagestep.upgrade
index c2272b611..f1e2ffaa8 100755
--- a/ccm-cms-assets-imagestep/src/ccm-cms-assets-imagestep.upgrade
+++ b/ccm-cms-assets-imagestep/src/ccm-cms-assets-imagestep.upgrade
@@ -8,4 +8,7 @@
   <version from="6.5.0" to="6.5.1">
     <script sql="ccm-ldn-image-step/upgrade/::database::-6.5.0-6.5.1.sql"/>
   </version>
+  <version from="6.6.0" to="6.6.1">
+    <script sql="ccm-cms-assets-imagestep/upgrade/::database::-6.6.0-6.6.1.sql"/>
+  </version>
 </upgrade>