diff --git a/configure.ac b/configure.ac
index eb047d66714c6cf125d38ee06e9da6274d2bd5b9..f65075d1c409e6ff8249c57373a415e3f3110c31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,7 +410,7 @@ LIBVIRT_DRIVER_ARG_LXC
 LIBVIRT_ARG_WITH([ESX], [ESX], [check])
 LIBVIRT_ARG_WITH([HYPERV], [Hyper-V], [check])
 LIBVIRT_DRIVER_ARG_TEST
-LIBVIRT_ARG_WITH([REMOTE], [remote driver], [yes])
+LIBVIRT_DRIVER_ARG_REMOTE
 LIBVIRT_ARG_WITH([LIBVIRTD], [libvirtd], [yes])
 
 dnl
@@ -477,11 +477,7 @@ AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"])
 
 LIBVIRT_DRIVER_CHECK_QEMU
 LIBVIRT_DRIVER_CHECK_TEST
-
-if test "$with_remote" = "yes" ; then
-    AC_DEFINE_UNQUOTED([WITH_REMOTE], 1, [whether Remote driver is enabled])
-fi
-AM_CONDITIONAL([WITH_REMOTE], [test "$with_remote" = "yes"])
+LIBVIRT_DRIVER_CHECK_REMOTE
 
 if test "$with_libvirtd" = "yes" ; then
     AC_DEFINE_UNQUOTED([WITH_LIBVIRTD], 1, [whether libvirtd daemon is enabled])
@@ -1370,7 +1366,7 @@ AC_MSG_NOTICE([  Hyper-V: $with_hyperv])
 LIBVIRT_DRIVER_RESULT_VZ
 LIBVIRT_DRIVER_RESULT_BHYVE
 LIBVIRT_DRIVER_RESULT_TEST
-AC_MSG_NOTICE([   Remote: $with_remote])
+LIBVIRT_DRIVER_RESULT_REMOTE
 AC_MSG_NOTICE([  Network: $with_network])
 AC_MSG_NOTICE([ Libvirtd: $with_libvirtd])
 AC_MSG_NOTICE([Interface: $with_interface])
diff --git a/m4/virt-driver-remote.m4 b/m4/virt-driver-remote.m4
new file mode 100644
index 0000000000000000000000000000000000000000..0b1f02e1a094db6f497e44688ff437baca00abd4
--- /dev/null
+++ b/m4/virt-driver-remote.m4
@@ -0,0 +1,33 @@
+dnl The remote driver
+dnl
+dnl Copyright (C) 2016 Red Hat, Inc.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library.  If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([LIBVIRT_DRIVER_ARG_REMOTE], [
+  LIBVIRT_ARG_WITH([REMOTE], [remote driver], [yes])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_CHECK_REMOTE], [
+  if test "$with_remote" = "yes" ; then
+    AC_DEFINE_UNQUOTED([WITH_REMOTE], 1, [whether Remote driver is enabled])
+  fi
+  AM_CONDITIONAL([WITH_REMOTE], [test "$with_remote" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_RESULT_REMOTE], [
+  LIBVIRT_RESULT([Remote], [$with_remote])
+])