diff --git a/configure b/configure
index 8f99b7b..4cfcdc6 100755
--- a/configure
+++ b/configure
@@ -214,7 +214,7 @@ smartcard_nss=""
 usb_redir=""
 opengl=""
 zlib="yes"
-guest_agent="yes"
+qemuga="yes"
 want_tools="yes"
 libiscsi=""
 coroutine=""
@@ -844,9 +844,9 @@ for opt do
   ;;
   --disable-zlib-test) zlib="no"
   ;;
-  --enable-guest-agent) guest_agent="yes"
+  --enable-guest-agent) qemuga="yes"
   ;;
-  --disable-guest-agent) guest_agent="no"
+  --disable-guest-agent) qemuga="no"
   ;;
   --enable-tools) want_tools="yes"
   ;;
@@ -3059,7 +3059,7 @@ if test "$softmmu" = yes ; then
     fi
   fi
   if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
-    if [ "$guest_agent" = "yes" ]; then
+    if [ "$qemuga" = "yes" ]; then
       tools="qemu-ga\$(EXESUF) $tools"
     fi
   fi
@@ -3167,7 +3167,7 @@ echo "nss used          $smartcard_nss"
 echo "usb net redir     $usb_redir"
 echo "OpenGL support    $opengl"
 echo "libiscsi support  $libiscsi"
-echo "build guest agent $guest_agent"
+echo "build guest agent $qemuga"
 echo "seccomp support   $seccomp"
 echo "coroutine backend $coroutine_backend"