diff --git a/configure.in b/configure.in
index 660fe4e7..d61367a4 100644
--- a/configure.in
+++ b/configure.in
@@ -170,6 +170,24 @@ fi
 
 AM_CONDITIONAL([DISABLE_DOC], [test ${enable_doc} = no])
 
+dnl ******************************
+dnl Optional btrfs support
+dnl ******************************
+
+with_btrfs="no"
+AC_ARG_ENABLE(	btrfs,
+		AS_HELP_STRING([--enable-btrfs], [enable experimental btrfs support (disabled by default)]),
+		with_btrfs=$enableval,
+		with_btrfs=no)
+
+if test "x$with_btrfs" = "xyes"; then
+                with_btrfs="yes"
+                AC_DEFINE(BTRFS_SUPPORT,1,[Build in btrfs support])
+else
+        with_btrfs="no"
+fi
+AM_CONDITIONAL(BTRFS_SUPPORT, test "x$with_btrfs" = "xyes")
+
 
 AC_CONFIG_FILES([
 Makefile
@@ -194,6 +212,8 @@ echo ""
 echo "================ Final configuration ==================="
 echo "                 Installing into prefix  :  $prefix"
 echo ""
+echo "                  Enable btrfs support?  :  $with_btrfs"
+echo ""
 echo "                   Build documentation?  :  $enable_doc"
 echo ""
 echo "   Need part table re-read work around?  :  $need_pt_reread_work_around"