diff --git a/configure.ac b/configure.ac
index d78fa1e..936179c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,13 +84,25 @@ AS_IF([test "x$enable_usrmerge" = "xauto"], [
 ])
 
 # Checks for libraries.
-AC_CHECK_LIB([uuid], [uuid_generate], [
-    AC_DEFINE([HAVE_LIBUUID], 1,
-              [Define to 1 if you have the 'uuid' library (-luuid).])
-    AC_SUBST(UUID_LIBS, ["-luuid"])
-    AC_SUBST(UUID_CFLAGS, [""])
-], [
-    AC_MSG_ERROR([UUID library not found])
+m4_ifdef([PKG_CHECK_MODULES], [
+    PKG_CHECK_MODULES([UUID], [uuid], [
+        have_uuid_pkg_config=yes
+        AC_DEFINE([HAVE_LIBUUID], 1,
+                  [Define to 1 if you have the 'uuid' library (-luuid).])
+    ], [have_uuid_pkg_config=no])
+], [have_uuid_pkg_config=no])
+
+# Fall back
+AS_IF([test "x$have_uuid_pkg_config" = "xno"], [
+    AC_CHECK_LIB([uuid], [uuid_generate], [
+        AC_DEFINE([HAVE_LIBUUID], 1,
+                  [Define to 1 if you have the 'uuid' library (-luuid).])
+        AC_SUBST(UUID_LIBS, ["-luuid"])
+        AC_SUBST(UUID_CFLAGS, ["-I/usr/include/uuid"])
+    ], [
+        AC_MSG_ERROR([UUID library not found])
+    ])
+    AC_CHECK_HEADERS([uuid/uuid.h])
 ])
 
 LIB_POSIX_MQ=''
diff --git a/include/cleaner_msg.h b/include/cleaner_msg.h
index 91a465f..9cde088 100644
--- a/include/cleaner_msg.h
+++ b/include/cleaner_msg.h
@@ -12,7 +12,7 @@
 #define NILFS_CLEANER_MSG_H
 
 #include <stdint.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
 #include "nilfs_cleaner.h"
 
 #define NILFS_CLEANER_PRIO_HIGH		1
diff --git a/lib/cleaner_ctl.c b/lib/cleaner_ctl.c
index 48e52f2..044c597 100644
--- a/lib/cleaner_ctl.c
+++ b/lib/cleaner_ctl.c
@@ -74,7 +74,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <assert.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
 
 #include "nilfs_cleaner.h"
 #include "cleaner_exec.h"
diff --git a/sbin/cleanerd.c b/sbin/cleanerd.c
index f86ed63..916dbaf 100644
--- a/sbin/cleanerd.c
+++ b/sbin/cleanerd.c
@@ -73,7 +73,7 @@
 #include <signal.h>
 #include <setjmp.h>
 #include <assert.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
 #include <linux/nilfs2_ondisk.h>  /* NILFS_MIN_NRSVSEGS */
 #include "nilfs.h"
 #include "compat.h"
diff --git a/sbin/mkfs.c b/sbin/mkfs.c
index 9657cf9..f7b0b3a 100644
--- a/sbin/mkfs.c
+++ b/sbin/mkfs.c
@@ -50,7 +50,7 @@
 #include <sys/wait.h>
 #endif	/* HAVE_SYS_WAIT_H */
 
-#include <uuid/uuid.h>
+#include <uuid.h>
 
 #if HAVE_STRING_H
 #include <string.h>