3 files changed, 13 insertions, 7 deletions
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-console-image.bb
index 3977e223af..8bd0fe07e7 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-console-image.bb
@@ -1,6 +1,6 @@
 #Angstrom bootstrap image
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
@@ -10,7 +10,7 @@ RDEPENDS = "task-base-core-default \
 	    ${ANGSTROM_EXTRA_INSTALL} \
 	   "
 
-export IMAGE_BASENAME = "bootstrap-image"
+export IMAGE_BASENAME = "console-image"
 export IMAGE_LINGUAS = ""
 export PACKAGE_INSTALL = "${RDEPENDS}"
 
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-x11-image.bb
index d366a62bf7..dbb986ae65 100644
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-x11-image.bb
@@ -1,6 +1,6 @@
-#Angstrom GPE image
+#Angstrom X11 image
 LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
 
 PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
 PREFERRED_PROVIDER_tslib 		?= "tslib"
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
 ANGSTROM_EXTRA_INSTALL ?= ""
 XSERVER ?= "xserver-kdrive-fbdev"
 
-export IMAGE_BASENAME = "gpe-image"
+export IMAGE_BASENAME = "x11-image"
 
 DEPENDS = "task-base"
 RDEPENDS = "\
@@ -21,7 +21,6 @@ RDEPENDS = "\
     angstrom-x11-base-depends \
     angstrom-gpe-task-base \
     angstrom-gpe-task-settings \
-    angstrom-gpe-task-pim \
     ${ANGSTROM_EXTRA_INSTALL}"
 
 
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index 36aa431d42..490955af9c 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r28"
+PR = "r29"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -11,6 +11,7 @@ PACKAGES = "\
     angstrom-gpe-task-pim \
     angstrom-gpe-task-apps \
     angstrom-gpe-task-games \
+    angstrom-ohand-task-pim \
     angstrom-task-office \
     angstrom-task-printing \
     angstrom-task-sectest"
@@ -61,6 +62,12 @@ RDEPENDS_angstrom-gpe-task-pim := "\
     gpe-contacts \
     gpesyncd"
 
+RDEPENDS_angstrom-ohand-task-pim := "\
+    dates \
+    contacts \
+    tasks \
+"
+
 RDEPENDS_angstrom-gpe-task-settings := "\
     matchbox-panel-manager \
     gpe-su \