diff --git a/libisoburn/trunk/acinclude.m4 b/libisoburn/trunk/acinclude.m4
index e539dacb..b1395377 100644
--- a/libisoburn/trunk/acinclude.m4
+++ b/libisoburn/trunk/acinclude.m4
@@ -36,6 +36,14 @@ AC_DEFUN([TARGET_SHIZZLE],
       # This may later be overridden by configure --enable-libdir-pkgconfig
       LIBBURNIA_PKGCONFDIR=$(echo "$libdir" | sed 's/\/lib$/\/libdata/')/pkgconfig
       ;;
+    kfreebsd*-gnu)
+      ARCH=freebsd
+      LIBBURN_ARCH_LIBS=-lcam
+      ;;
+    *-solaris*)
+      ARCH=solaris
+      LIBBURN_ARCH_LIBS=-lvolmgt
+      ;;
     *)
       ARCH=
       LIBBURN_ARCH_LIBS=
diff --git a/libisoburn/trunk/xorriso/README_gnu_xorriso b/libisoburn/trunk/xorriso/README_gnu_xorriso
index 51c88183..90968ca5 100644
--- a/libisoburn/trunk/xorriso/README_gnu_xorriso
+++ b/libisoburn/trunk/xorriso/README_gnu_xorriso
@@ -39,6 +39,7 @@ Prerequisites:
 The tarball contains everything that is needed except the following system
 components:
    libc, libpthread
+   plus on Solaris: libvolmgt
    plus on FreeBSD: libiconv, libcam, IDE and SATA drives need atapicam
 Optional at compile time are:
    libreadline and the readline-dev headers, or libedit and its header,
diff --git a/libisoburn/trunk/xorriso/xorriso_eng.html b/libisoburn/trunk/xorriso/xorriso_eng.html
index b963b9a4..3c1f2f2f 100644
--- a/libisoburn/trunk/xorriso/xorriso_eng.html
+++ b/libisoburn/trunk/xorriso/xorriso_eng.html
@@ -62,7 +62,7 @@ Images or add-on sessions may be written to about any kind of file object.
 <DD>SATA drives need atapicam running or need to be driven by ahci.</DD>
 <DD>libcam has to be installed.</DD>
 <DD>libiconv has to be installed.</DD>
-<DT>or Solaris, libc, libpthread :</DT>
+<DT>or Solaris, libc, libpthread, libvolmgt :</DT>
 <DD>Tested on kernel 5.11, hopefully suitable for older ones too.</DD>
 <DT>or NetBSD, libc, libpthread :</DT>
 <DD>Tested on 6.1.2 and 6.1.3, hopefully suitable for older ones too.</DD>
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 673765a7..f0dbaf07 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2014.11.26.164605"
+#define Xorriso_timestamP "2014.12.21.222445"