diff --git a/src/freedombone-image b/src/freedombone-image
index dad21224..f1043815 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -205,7 +205,13 @@ fi
 mv build/${PROJECT_NAME}*.bz2 ${CURR_DIR}
 mv build/${PROJECT_NAME}*.img ${CURR_DIR}
 mv build/${PROJECT_NAME}*.sig ${CURR_DIR}
-#rm -rf ${BUILD_DIR}
+rm -rf ${BUILD_DIR}
+
+cd ${CURR_DIR}
+if [[ $IMAGE_TYPE == "virtualbox"* ]]; then
+    imgfiles=(${PROJECT_NAME}*.img)
+    VBoxManage convertfromraw --format VDI ${imgfiles[0]} ${imgfiles[0]}.vdi
+fi
 
 clear
 echo "
@@ -217,7 +223,6 @@ You will be able to log into it with:
 
     Password: $PASSWORD
 "
-cd ${CURR_DIR}
 ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.bz2
 
 # record the default login credentials for later use