diff --git a/libisoburn/trunk/Makefile.am b/libisoburn/trunk/Makefile.am
index 9782ecc0..465ad502 100644
--- a/libisoburn/trunk/Makefile.am
+++ b/libisoburn/trunk/Makefile.am
@@ -47,7 +47,9 @@ bin_PROGRAMS = \
 
 xorriso_xorriso_CPPFLAGS = -Ilibisoburn
 xorriso_xorriso_CFLAGS = -DXorriso_with_maiN $(READLINE_DEF)
-xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn $(THREAD_LIBS)
+xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn \
+		$(THREAD_LIBS) -lacl
+
 xorriso_xorriso_SOURCES = \
 	xorriso/xorriso.h \
 	xorriso/xorriso_private.h \
diff --git a/libisoburn/trunk/xorriso/compile_xorriso.sh b/libisoburn/trunk/xorriso/compile_xorriso.sh
index 144c6490..4e12b098 100755
--- a/libisoburn/trunk/xorriso/compile_xorriso.sh
+++ b/libisoburn/trunk/xorriso/compile_xorriso.sh
@@ -84,7 +84,7 @@ libisofs="$libisofs $isofs"/util_htable.o
 libisofs="$libisofs $isofs"/util_rbtree.o
 libisofs="$libisofs $isofs"/system_area.o
 libisofs="$libisofs $isofs"/make_isohybrid_mbr.o
-
+libisofs="$libisofs $isofs"/aaip_0_2.o
 
 echo "Version timestamp :  $(sed -e 's/#define Xorriso_timestamP "//' -e 's/"$//' "$xorr"/xorriso_timestamp.h)"
 
@@ -141,7 +141,8 @@ cc -I. -DXorriso_with_maiN $def_libreadline \
   \
   $link_libreadline \
   \
-  -lpthread
+  -lpthread \
+  -lacl
 
   ret=$?
   if test "$ret" = 0
diff --git a/libisoburn/trunk/xorriso/xorriso_makefile_am.txt b/libisoburn/trunk/xorriso/xorriso_makefile_am.txt
index 2c3b2072..6bd5e3c7 100644
--- a/libisoburn/trunk/xorriso/xorriso_makefile_am.txt
+++ b/libisoburn/trunk/xorriso/xorriso_makefile_am.txt
@@ -18,7 +18,7 @@ xorriso_xorriso_CPPFLAGS = -I./libburn -I./libisofs -I./libisoburn -I./xorriso
 # are in a separate readline-development package.
 xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN $(READLINE_DEF)
 
-xorriso_xorriso_LDADD = $(THREAD_LIBS)
+xorriso_xorriso_LDADD = $(THREAD_LIBS) -lacl
 
 
 # This looks quite ugly with make install: xorriso.c is compiled twice again
@@ -99,6 +99,8 @@ xorriso_xorriso_SOURCES = \
         libisofs/system_area.h \
         libisofs/system_area.c \
         libisofs/make_isohybrid_mbr.c \
+	libisofs/aaip_0_2.h \
+	libisofs/aaip_0_2.c \
 	\
 	libburn/async.c \
 	libburn/async.h \
@@ -225,6 +227,8 @@ EXTRA_DIST = \
 	INSTALL \
 	xorriso/changelog.txt \
 	xorriso/xorriso_buildstamp_none.h \
-	$(man_MANS)
+	$(man_MANS) \
+	libisofs/aaip-os-linux.c \
+	libisofs/aaip-os-freebsd.c
 	
 
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index db05fae8..a2671645 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.01.10.154018"
+#define Xorriso_timestamP "2009.01.14.110935"