diff --git a/Makefile.am b/Makefile.am
index 0626773..8743f70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,11 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = bmc
+SUBDIRS =
+
+if BUILD_BMC_HANDLER
+SUBDIRS += bmc
+endif
 
 if BUILD_HOST_TOOL
 SUBDIRS += tools
diff --git a/configure.ac b/configure.ac
index 756c89b..1393041 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,12 @@
 )
 AM_CONDITIONAL([BUILD_HOST_TOOL], [test "x$enable_build_host_tool" != "xno"])
 
+# Enable building the bmc (default: yes)
+AC_ARG_ENABLE([build-bmc-blob-handler],
+    AC_HELP_STRING([--disable-build-bmc-blob-handler], [Disable buliding the BMC BLOB handler])
+)
+AM_CONDITIONAL([BUILD_BMC_HANDLER], [test "x$enable_build_bmc_blob_handler" != "xno"])
+
 # If not building the host-tool, we're building the BMC.
 AS_IF([test "x$enable_build_host_tool" != "xyes"], [
     PKG_CHECK_MODULES(
@@ -99,7 +105,7 @@
     AX_APPEND_COMPILE_FLAGS([-DENABLE_REBOOT_UPDATE], [CXXFLAGS])
 ])
 
-# Enable the cleanup handle that deletes the temporary files.
+# Enable the cleanup handle that deletes the temporary files. (default: no)
 AC_ARG_ENABLE([cleanup-delete],
     AS_HELP_STRING([--enable-cleanup-delete],
                    [Enable use of the delete files cleanup mechanism.]))