diff --git a/ChangeLog b/ChangeLog
index f6c05e03..1b3cf377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-15  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Submitted by Aurelien Jarno:
+	* configure.ac: Fix build for GNU/kFreeBSD, fix FreeBSD
+	default serial port name.
+	* ppi.c: Fix build for GNU/kFreeBSD.
+	* par.c: (Dito.)
+
 2010-01-15  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* configure.ac: Bump version for post-5.8.
diff --git a/configure.ac b/configure.ac
index 821e26ea..2aa36a40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,11 +196,11 @@ case $target in
 		DEFAULT_PAR_PORT="unknown"
 		DEFAULT_SER_PORT="/dev/ttyS0"
 		;;
-	i[[3456]]86-*-freebsd*|amd64-*-freebsd*)
+	i[[3456]]86-*-*freebsd*|amd64-*-*freebsd*)
 		DEFAULT_PAR_PORT="/dev/ppi0"
 		DEFAULT_SER_PORT="/dev/cuaa0"
 		;;
-	*-*-freebsd*)
+	*-*-*freebsd*)
 		DEFAULT_PAR_PORT="unknown"
 		DEFAULT_SER_PORT="/dev/cuaa0"
 		;;
diff --git a/par.c b/par.c
index 6b8bca46..5a42174d 100644
--- a/par.c
+++ b/par.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 # include "freebsd_ppi.h"
 #elif defined(__linux__)
 # include "linux_ppdev.h"
diff --git a/ppi.c b/ppi.c
index 4397d000..423d5923 100644
--- a/ppi.c
+++ b/ppi.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 # include "freebsd_ppi.h"
 #elif defined(__linux__)
 # include "linux_ppdev.h"