diff --git a/Android.mk b/Android.mk
index 50b0de6..edbfa2d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@ LOCAL_MODULE := recovery
 
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
-RECOVERY_VERSION := ClockworkMod Recovery v1.8.1.7
+RECOVERY_VERSION := ClockworkMod Recovery v1.8.1.8
 LOCAL_CFLAGS := -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
 RECOVERY_API_VERSION := 2
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
diff --git a/killrecovery.sh b/killrecovery.sh
index a0ede44..f215250 100755
--- a/killrecovery.sh
+++ b/killrecovery.sh
@@ -1,4 +1,8 @@
 #!/sbin/sh
 mkdir -p /sd-ext
+rm /cache/recovery/command
+rm /cache/update.zip
+touch /tmp/.ignorebootmessage
 kill $(ps | grep /sbin/adbd)
 kill $(ps | grep /sbin/recovery)
+exit 1
\ No newline at end of file
diff --git a/recovery.c b/recovery.c
index ed2bbb9..9be9758 100644
--- a/recovery.c
+++ b/recovery.c
@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #include "bootloader.h"
 #include "common.h"
@@ -166,8 +167,10 @@ get_args(int *argc, char ***argv) {
         LOGI("Boot status: %.*s\n", sizeof(boot.status), boot.status);
     }
 
+    struct stat file_info;
+
     // --- if arguments weren't supplied, look in the bootloader control block
-    if (*argc <= 1) {
+    if (*argc <= 1 && 0 != stat("/tmp/.ignorebootmessage", &file_info)) {
         boot.recovery[sizeof(boot.recovery) - 1] = '\0';  // Ensure termination
         const char *arg = strtok(boot.recovery, "\n");
         if (arg != NULL && !strcmp(arg, "recovery")) {