--- a/Makefile	2012-07-31 01:21:07.000000000 +0300
+++ b/Makefile	2012-07-31 01:13:34.000000000 +0300
@@ -37,7 +37,10 @@
 
 LIBS+=-lz $(LIBS_TOOLS)
 
-HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
+HELPERS-$(CONFIG_LINUX) =
+ifeq (CONFIG_BRIDGE_HELPER, "y")
+	HELPERS-$(CONFIG_LINUX) += qemu-bridge-helper$(EXESUF)
+endif
 
 ifdef BUILD_DOCS
 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
 
--- a/configure	2012-07-31 01:21:06.000000000 +0300
+++ b/configure	2012-07-31 01:13:41.000000000 +0300
@@ -193,6 +193,7 @@
 opengl=""
 zlib="yes"
 guest_agent="yes"
+bridge_helper="yes"
 libiscsi=""
 coroutine=""
 
@@ -824,6 +825,10 @@
   ;;
   --disable-guest-agent) guest_agent="no"
   ;;
+  --enable-bridge-helper) bridge_helper="yes"
+  ;;
+  --disable-bridge-helper) bridge_helper="no"
+  ;;
   *) echo "ERROR: unknown option $opt"; show_help="yes"
   ;;
   esac
@@ -1110,6 +1115,8 @@
 echo "  --enable-usb-redir       enable usb network redirection support"
 echo "  --disable-guest-agent    disable building of the QEMU Guest Agent"
 echo "  --enable-guest-agent     enable building of the QEMU Guest Agent"
+echo "  --enable-bridge-helper   enable building of the qemu-bridge-helper"
+echo "  --disable-bridge-helper  disable building of the qemu-bridge-helper"
 echo "  --with-coroutine=BACKEND coroutine backend. Supported options:"
 echo "                           gthread, ucontext, sigaltstack, windows"
 echo ""
@@ -2968,6 +2975,9 @@
     fi
   fi
 fi
+if [ "$bridge_helper" = "yes" ]; then
+  echo "CONFIG_BRIDGE_HELPER=y" >> $config_host_mak
+fi
 if test "$smartcard_nss" = "yes" ; then
   tools="vscclient\$(EXESUF) $tools"
 fi
@@ -3071,6 +3081,7 @@
 echo "OpenGL support    $opengl"
 echo "libiscsi support  $libiscsi"
 echo "build guest agent $guest_agent"
+echo "build bridge helper $bridge_helper"
 echo "coroutine backend $coroutine_backend"
 
 if test "$sdl_too_old" = "yes"; then