diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 0eaa5e9bb7..cbdc29914e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -1,6 +1,11 @@
 inherit rootfs_${IMAGE_PKGTYPE}
 
+LICENSE = "MIT"
 PACKAGES = ""
+RDEPENDS = "${IMAGE_INSTALL}"
+
+export IMAGE_BASENAME = "${PN}"
+export PACKAGE_INSTALL = "${IMAGE_INSTALL}"
 
 # We need to recursively follow RDEPENDS and RRECOMMENDS for images
 BUILD_ALL_DEPS = "1"
diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb
index 9b87f833e8..e10c907184 100644
--- a/meta/packages/images/oh-image-base.bb
+++ b/meta/packages/images/oh-image-base.bb
@@ -1,12 +1,7 @@
-PR = "r0"
-
-export IMAGE_BASENAME = "oh-image-base"
-
-DEPENDS = "task-oh"
-    
-RDEPENDS = "${DISTRO_TASKS}"
-
-export PACKAGE_INSTALL = "${RDEPENDS}"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
+IMAGE_INSTALL = "${DISTRO_TASKS}"
 inherit image
-LICENSE = MIT
+
diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb
index 0e2e7d6f0d..b069a82d88 100644
--- a/meta/packages/images/oh-image-core.bb
+++ b/meta/packages/images/oh-image-core.bb
@@ -1,14 +1,8 @@
-PR = "r0"
-
-export IMAGE_BASENAME = "oh-image-core"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
 IMAGE_FEATURES += "apps-core"
-
-DEPENDS = "task-oh"
-    
-RDEPENDS = "${DISTRO_TASKS}" 
-
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
+IMAGE_INSTALL = "${DISTRO_TASKS}"
 inherit image
-LICENSE = MIT
+
diff --git a/meta/packages/images/oh-image-minimal.bb b/meta/packages/images/oh-image-minimal.bb
index bc77727d3c..567caaac42 100644
--- a/meta/packages/images/oh-image-minimal.bb
+++ b/meta/packages/images/oh-image-minimal.bb
@@ -1,9 +1,8 @@
-LICENSE = "MIT"
-DEPENDS = "task-oh"
-
-export IMAGE_BASENAME = "${PN}"
-export PACKAGE_INSTALL = "task-oh-boot"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
+IMAGE_INSTALL = "task-oh-boot"
 inherit image
 
 # remove not needed stuff (locale support and ipkg support)
diff --git a/meta/packages/images/oh-image-pda.bb b/meta/packages/images/oh-image-pda.bb
index b072458a36..7056e47248 100644
--- a/meta/packages/images/oh-image-pda.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -1,14 +1,7 @@
-PR = "r10"
-
-export IMAGE_BASENAME = "oh-image-pda"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
 IMAGE_FEATURES += "apps-core apps-pda"
-
-DEPENDS = "task-oh"
-
-RDEPENDS = "${DISTRO_TASKS}"   
-
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
+IMAGE_INSTALL = "${DISTRO_TASKS}"
 inherit image
-LICENSE = MIT
diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb
index 581defb816..61f9e26b18 100644
--- a/meta/packages/images/oh-image-sdk.bb
+++ b/meta/packages/images/oh-image-sdk.bb
@@ -1,15 +1,7 @@
-PR = "r9"
-
-export IMAGE_BASENAME = "oh-image-sdk"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
 IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
-
-DEPENDS = "\
-    task-oh \
-    task-oh-sdk"
-    
-RDEPENDS = "${DISTRO_TASKS}"
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
+IMAGE_INSTALL = "${DISTRO_TASKS}"
 inherit image
-LICENSE = MIT