diff --git a/AUTHORS b/AUTHORS
index 9d8366ba..767c653d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,6 +2,7 @@ Andy Smith <github@anarkystic.com>
 Anthony Young <sleepsonthefloor@gmail.com>
 Brad Hall <brad@nicira.com>
 Chmouel Boudjnah <chmouel@chmouel.com>
+Darren Birkett <darren.birkett@gmail.com>
 Dean Troyer <dtroyer@gmail.com>
 Devin Carlen <devin.carlen@gmail.com>
 Eddie Hebert <edhebert@gmail.com>
@@ -16,3 +17,4 @@ Todd Willey <xtoddx@gmail.com>
 Tres Henry <tres@treshenry.net>
 Vishvananda Ishaya <vishvananda@gmail.com>
 Yun Mao <yunmao@gmail.com>
+
diff --git a/stack.sh b/stack.sh
index 7d66e319..5c51e516 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1219,15 +1219,27 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
         fi
 
         # Extract ami and aki files
-        tar -zxf $FILES/$IMAGE_FNAME -C $FILES/images
+        mkdir -p $FILES/images/$IMAGE_NAME
+        tar -zxf $FILES/$IMAGE_FNAME -C $FILES/images/$IMAGE_NAME
+
+
+        # mustn't assume the img and kernel files are named the same as the tar basename
+        if [ -f $FILES/images/$IMAGE_NAME/*vmlinuz-virtual* ];then
+            KERNEL_FILE=$(basename $(find $FILES/images/$IMAGE_NAME/*vmlinuz-virtual*))
+            IMAGE_BASENAME=$(basename $KERNEL_FILE -vmlinuz-virtual)
+        else
+            KERNEL_FILE=$(basename $(find $FILES/images/$IMAGE_NAME/*vmlinuz*))
+            IMAGE_BASENAME=$(basename $KERNEL_FILE -vmlinuz)
+        fi
+
 
         # Use glance client to add the kernel the root filesystem.
         # We parse the results of the first upload to get the glance ID of the
         # kernel for use when uploading the root filesystem.
-        RVAL=`glance add -A $SERVICE_TOKEN name="$IMAGE_NAME-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/$IMAGE_NAME-vmlinuz*`
+        RVAL=$(glance add -A $SERVICE_TOKEN name="$IMAGE_BASENAME-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/$IMAGE_NAME/$KERNEL_FILE)
         KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "`
-        glance add -A $SERVICE_TOKEN name="$IMAGE_NAME" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID < $FILES/images/$IMAGE_NAME.img
-    done
+       glance add -A $SERVICE_TOKEN name="$IMAGE_BASENAME" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID < $FILES/images/$IMAGE_NAME/$IMAGE_BASENAME.img
+
 fi
 
 # Fin