diff --git a/Makefile.am b/Makefile.am
index 465ad502..21873d29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,9 +46,11 @@ bin_PROGRAMS = \
 # 	cat xorriso/xorriso_buildstamp.h
 
 xorriso_xorriso_CPPFLAGS = -Ilibisoburn
-xorriso_xorriso_CFLAGS = -DXorriso_with_maiN $(READLINE_DEF)
+xorriso_xorriso_CFLAGS = -DXorriso_with_maiN \
+                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF)
+
 xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn \
-		$(THREAD_LIBS) -lacl
+		$(THREAD_LIBS)
 
 xorriso_xorriso_SOURCES = \
 	xorriso/xorriso.h \
diff --git a/configure.ac b/configure.ac
index 72963278..e81951fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,12 +102,41 @@ else
 fi
 AC_SUBST(READLINE_DEF)
 
+
+AC_ARG_ENABLE(libacl,
+[  --enable-libacl    Enable use of libacl by libisofs, default=yes],
+               , enable_libacl=yes)
+if test x$enable_libacl = xyes; then
+dnl Check whether there is libacl-devel and libacl-runtime.
+dnl If not, erase this macro which would enable use of acl_to_text and others
+    LIBACL_DEF="-DLibisofs_with_aaip_acL"
+dnl The empty yes case obviously causes -lacl to be linked
+    AC_CHECK_HEADER(sys/acl.h, AC_CHECK_LIB(acl, acl_to_text, , LIBACL_DEF= ), LIBACL_DEF= )
+else
+    LIBACL_DEF=
+fi
+AC_SUBST(LIBACL_DEF)
+
+
+AC_ARG_ENABLE(xattr,
+[  --enable-xattr     Enable use of xattr by libisofs, default=yes],
+               , enable_xattr=yes)
+if test x$enable_xattr = xyes; then
+dnl Check whether there is the header for Linux xattr. 
+dnl If not, erase this macro which would enable use of listxattr and others
+    XATTR_DEF="-DLibisofs_with_aaip_xattR"
+    AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= , XATTR_DEF= ), XATTR_DEF= )
+else
+    XATTR_DEF=
+fi
+AC_SUBST(XATTR_DEF)
+
 AC_CHECK_HEADER(libburn/libburn.h)
 AC_CHECK_HEADER(libisofs/libisofs.h)
 
 dnl Check for proper library versions
 LIBBURN_REQUIRED=0.6.0
-LIBISOFS_REQUIRED=0.6.12
+LIBISOFS_REQUIRED=0.6.13
 PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED)
 PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED)
 
diff --git a/xorriso/configure_ac.txt b/xorriso/configure_ac.txt
index e1a50564..22ef3790 100644
--- a/xorriso/configure_ac.txt
+++ b/xorriso/configure_ac.txt
@@ -112,6 +112,35 @@ fi
 AC_SUBST(READLINE_DEF)
 
 
+AC_ARG_ENABLE(libacl,
+[  --enable-libacl    Enable use of libacl by libisofs, default=yes],
+               , enable_libacl=yes)
+if test x$enable_libacl = xyes; then
+dnl Check whether there is libacl-devel and libacl-runtime.
+dnl If not, erase this macro which would enable use of acl_to_text and others
+    LIBACL_DEF="-DLibisofs_with_aaip_acL"
+dnl The empty yes case obviously causes -lacl to be linked
+    AC_CHECK_HEADER(sys/acl.h, AC_CHECK_LIB(acl, acl_to_text, , LIBACL_DEF= ), LIBACL_DEF= )
+else
+    LIBACL_DEF=
+fi
+AC_SUBST(LIBACL_DEF)
+
+
+AC_ARG_ENABLE(xattr,
+[  --enable-xattr     Enable use of xattr by libisofs, default=yes],
+               , enable_xattr=yes)
+if test x$enable_xattr = xyes; then
+dnl Check whether there is the header for Linux xattr.
+dnl If not, erase this macro which would enable use of listxattr and others
+    XATTR_DEF="-DLibisofs_with_aaip_xattR"
+    AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= , XATTR_DEF= ), XATTR_DEF= )
+else
+    XATTR_DEF=
+fi
+AC_SUBST(XATTR_DEF)
+
+
 AC_CONFIG_FILES([
 	Makefile
 	version.h
diff --git a/xorriso/xorriso_makefile_am.txt b/xorriso/xorriso_makefile_am.txt
index 6bd5e3c7..1522dcc4 100644
--- a/xorriso/xorriso_makefile_am.txt
+++ b/xorriso/xorriso_makefile_am.txt
@@ -16,9 +16,10 @@ xorriso_xorriso_CPPFLAGS = -I./libburn -I./libisofs -I./libisoburn -I./xorriso
 
 # No readline in the vanilla version because the necessary headers
 # are in a separate readline-development package.
-xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN $(READLINE_DEF)
+xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN \
+                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF)
 
-xorriso_xorriso_LDADD = $(THREAD_LIBS) -lacl
+xorriso_xorriso_LDADD = $(THREAD_LIBS)
 
 
 # This looks quite ugly with make install: xorriso.c is compiled twice again
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 4f4fc02a..c8133576 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.01.23.140824"
+#define Xorriso_timestamP "2009.01.23.172652"