diff --git a/README.md b/README.md
index 3b49ccbf..39aa577a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 Web based interface for controlling the Raspberry Pi Camera, includes motion detection, time lapse, and image and video recording.
-Current version 6.0.5
+Current version 6.0.6
 All information on this project can be found here: http://www.raspberrypi.org/forums/viewtopic.php?f=43&t=63276
 
 The wiki page can be found here:
diff --git a/bin/raspimjpeg b/bin/raspimjpeg
index 5905733b..f015a19a 100755
Binary files a/bin/raspimjpeg and b/bin/raspimjpeg differ
diff --git a/etc/raspimjpeg/raspimjpeg.1 b/etc/raspimjpeg/raspimjpeg.1
index 64688e47..cf29d0eb 100755
--- a/etc/raspimjpeg/raspimjpeg.1
+++ b/etc/raspimjpeg/raspimjpeg.1
@@ -114,6 +114,8 @@ boxing_path
 subdir_char @
 
 #Job macros - prefix with & to make it run asynchronously
+error_soft error_soft.sh
+error_hard error_hard.sh
 end_img &end_img.sh
 start_vid &start_vid.sh
 end_vid end_vid.sh
diff --git a/www/config.php b/www/config.php
index 530b6558..f1d2b148 100755
--- a/www/config.php
+++ b/www/config.php
@@ -3,7 +3,7 @@
    define('LBASE_DIR',dirname(__FILE__));
    //Global defines and utility functions
    // version string
-   define('APP_VERSION', 'v6.0.5');
+   define('APP_VERSION', 'v6.0.6');
 
    // name of this application
    define('APP_NAME', 'RPi Cam Control');
diff --git a/www/macros/error_hard.sh b/www/macros/error_hard.sh
new file mode 100644
index 00000000..253bd3eb
--- /dev/null
+++ b/www/macros/error_hard.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo reboot