 +#ifdef MENDER_NO_DEFAULT_ALTBOOTCMD
 +# define MENDER_DEFAULT_ALTBOOTCMD
 +#else
-+# define MENDER_DEFAULT_ALTBOOTCMD "altbootcmd=run mender_altbootcmd\0"
++# define MENDER_DEFAULT_ALTBOOTCMD "altbootcmd=run mender_altbootcmd; " \
++    "run bootcmd\0"
 +#endif
 +
 +#define CONFIG_MENDER_ENV_SETTINGS                                      \

index 0000000..d79049f
--- /dev/null
+++ b/include/env_mender.h
@@ -0,0 +1,51 @@
+/*
+  Copyright (C) 2016  Mender Software
+

+    "fi; "                                                              \
+    "setenv upgrade_available 0; "                                      \
+    "saveenv; "                                                         \
+    "run mender_setup\0"
+
+#endif // ENV_MENDER_H
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
