diff --git a/build-driver/build.py b/build-driver/build.py
index 6003787f..6cf72599 100755
--- a/build-driver/build.py
+++ b/build-driver/build.py
@@ -315,8 +315,10 @@ def install_debian_dependencies():
             debootstrap ,
             dosfstools ,
             fai-client (>= 3.4.0) ,
+            ipxe ,
             isolinux (>= 3:6.03+dfsg-5+deb8u1~) ,
             jo ,
+            memtest86+ [amd64] ,
             mksh ,
             mmdebstrap ,
             moreutils ,
diff --git a/grml-live b/grml-live
index 76c9a3ed..16f4a48f 100755
--- a/grml-live
+++ b/grml-live
@@ -524,8 +524,7 @@ fi
 
 # Automatically enable NO_ADDONS=1 if addons are not present {{{
 if [ -z "${NO_ADDONS:-}" ] && [ ! -r "$TEMPLATE_DIRECTORY"/boot/addons ] ; then
-  ewarn "Boot addons not found, setting NO_ADDONS=1. (Consider installing package grml-live-addons)" ; eend 0
-  NO_ADDONS=1
+  ewarn "Boot addons not found, (Consider installing package grml-live-addons)" ; eend 0
 fi
 # }}}