diff --git a/configure.ac b/configure.ac
index ede25cadda9d49408b53f289dbc5b5a9c2f9a40c..09e241738f61625adf0fc99e100e462b06215add 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,7 @@ LIBPCAP_REQUIRED="1.0.0"
 LIBNL_REQUIRED="1.1"
 LIBSSH2_REQUIRED="1.0"
 LIBSSH2_TRANSPORT_REQUIRED="1.3"
-LIBBLKID_REQUIRED="2.17"
+BLKID_REQUIRED="2.17"
 FUSE_REQUIRED="2.8.6"
 
 dnl Checks for C compiler.
@@ -2315,15 +2315,15 @@ AC_ARG_WITH([libblkid],
 
 if test "x$with_libblkid" = "xyes" || test "x$with_libblkid" = "xcheck"; then
    PKG_CHECK_MODULES([BLKID],
-     [blkid >= $LIBBLKID_REQUIRED],
+     [blkid >= $BLKID_REQUIRED],
      [with_libblkid="yes"],
      [with_libblkid="no"])
 fi
 
 if test "x$with_libblkid" = "xyes"; then
-  AC_DEFINE([HAVE_LIBBLKID], [1], [libblkid is present])
+  AC_DEFINE([WITH_BLKID], [1], [libblkid is present])
 fi
-AM_CONDITIONAL([HAVE_LIBBLKID], [test "x$with_libblkid" = "xyes"])
+AM_CONDITIONAL([WITH_BLKID], [test "x$with_libblkid" = "xyes"])
 
 if test $with_freebsd = yes; then
   default_qemu_user=root
diff --git a/src/Makefile.am b/src/Makefile.am
index c9e87e14b9935fb59cf1a72e673bba860c34ed9a..8d6e53ba580cbcc6f9f4ba1de7138a2f2dd7bc19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -967,7 +967,7 @@ libvirt_driver_lxc_impl_la_CFLAGS = \
 		$(FUSE_CFLAGS) \
 		-I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_lxc_impl_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS) $(FUSE_LIBS)
-if HAVE_LIBBLKID
+if WITH_BLKID
 libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS)
 libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS)
 endif
@@ -1149,7 +1149,7 @@ endif
 if WITH_SECDRIVER_APPARMOR
 libvirt_driver_storage_impl_la_LIBADD += $(APPARMOR_LIBS)
 endif
-if HAVE_LIBBLKID
+if WITH_BLKID
 libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS)
 libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS)
 endif
@@ -1922,7 +1922,7 @@ libvirt_lxc_CFLAGS =				\
 		$(AM_CFLAGS)                    \
 		$(LIBNL_CFLAGS)			\
 		$(FUSE_CFLAGS)
-if HAVE_LIBBLKID
+if WITH_BLKID
 libvirt_lxc_CFLAGS += $(BLKID_CFLAGS)
 libvirt_lxc_LDADD += $(BLKID_LIBS)
 endif
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 73cffa1b735ad8480ad234f5b0c077fcfd87f0e9..bda326ea5371361830720a77f35938c4efccebb4 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -49,7 +49,7 @@
 # include <cap-ng.h>
 #endif
 
-#if HAVE_LIBBLKID
+#if WITH_BLKID
 # include <blkid/blkid.h>
 #endif
 
@@ -826,7 +826,7 @@ cleanup:
 }
 
 
-#ifdef HAVE_LIBBLKID
+#ifdef WITH_BLKID
 static int
 lxcContainerMountDetectFilesystem(const char *src, char **type)
 {
@@ -897,7 +897,7 @@ cleanup:
         blkid_free_probe(blkid);
     return ret;
 }
-#else /* ! HAVE_LIBBLKID */
+#else /* ! WITH_BLKID */
 static int
 lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED,
                                   char **type)
@@ -906,7 +906,7 @@ lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED,
     *type = NULL;
     return 0;
 }
-#endif /* ! HAVE_LIBBLKID */
+#endif /* ! WITH_BLKID */
 
 /*
  * This functions attempts to do automatic detection of filesystem
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 2205371db7c485b7166d4326a053bdea89d74127..21589a66d668a34bca093d9902ce34cb59f2e899 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -37,7 +37,7 @@
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 
-#if HAVE_LIBBLKID
+#if WITH_BLKID
 # include <blkid/blkid.h>
 #endif
 
@@ -540,7 +540,7 @@ virStorageBackendFileSystemStart(virConnectPtr conn ATTRIBUTE_UNUSED,
 }
 #endif /* WITH_STORAGE_FS */
 
-#if HAVE_LIBBLKID
+#if WITH_BLKID
 static virStoragePoolProbeResult
 virStorageBackendFileSystemProbe(const char *device,
                                  const char *format) {
@@ -611,7 +611,7 @@ error:
     return ret;
 }
 
-#else /* #if HAVE_LIBBLKID */
+#else /* #if WITH_BLKID */
 
 static virStoragePoolProbeResult
 virStorageBackendFileSystemProbe(const char *device ATTRIBUTE_UNUSED,
@@ -624,7 +624,7 @@ virStorageBackendFileSystemProbe(const char *device ATTRIBUTE_UNUSED,
     return FILESYSTEM_PROBE_ERROR;
 }
 
-#endif /* #if HAVE_LIBBLKID */
+#endif /* #if WITH_BLKID */
 
 /* some platforms don't support mkfs */
 #ifdef MKFS