diff --git a/acinclude.m4 b/acinclude.m4
index cad2824..4203580 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -16,6 +16,10 @@ AC_DEFUN([TARGET_SHIZZLE],
       LIBBURN_ARCH_LIBS=-lcam
       LIBBURNIA_PKGCONFDIR=$(echo "$libdir" | sed 's/\/lib$/\/libdata/')/pkgconfig
       ;;
+    kfreebsd*-gnu)
+      ARCH=freebsd
+      LIBBURN_ARCH_LIBS=-lcam
+      ;;
     *)
       ARCH=
       LIBBURN_ARCH_LIBS=
diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index 2393b0b..e741924 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2009.12.29.115854"
+#define Cdrskin_timestamP "2009.12.29.132537"
diff --git a/libburn/os.h b/libburn/os.h
index f283a4c..441ce80 100644
--- a/libburn/os.h
+++ b/libburn/os.h
@@ -29,6 +29,14 @@
 #include "os-freebsd.h"
 
 
+#else
+#ifdef __FreeBSD_kernel__
+
+
+/* ----------------------- FreeBSD with CAM under Debian ------------------- */
+#include "os-freebsd.h"
+
+
 #else
 #ifdef __linux
 
@@ -45,6 +53,7 @@
 
 
 #endif /* ! __linux */
+#endif /* ! __FreeBSD__kernel__ */
 #endif /* ! __FreeBSD__ */
 #endif /* ! Libburn_use_libcdiO */
 
diff --git a/libburn/sg.c b/libburn/sg.c
index 5dac767..258856a 100644
--- a/libburn/sg.c
+++ b/libburn/sg.c
@@ -14,6 +14,11 @@
 
 #include "sg-freebsd.c"
 
+#else
+#ifdef __FreeBSD_kernel__
+
+#include "sg-freebsd.c"
+
 #else
 #ifdef __linux
 
@@ -42,6 +47,7 @@ static int intentional_compiler_warning(void)
 #include "sg-dummy.c"
 
 #endif /* ! __linux */
+#endif /* ! __FreeBSD_kernel__ */
 #endif /* ! __FreeBSD__ */
 #endif /* ! Libburn_use_libcdiO */