diff --git a/ChangeLog b/ChangeLog
index 8831552..9729965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ Key:
 
 v.0.5dev (ongoing development)
  + sed1330 driver: Add support for HG25504 (L. Lagendijk)
+ * Build system: Fix xosd detection
 
 v0.5.4
  * Update driver includes and LDFLAGS (fixed glk and bayrad binding error)
diff --git a/acinclude.m4 b/acinclude.m4
index eadcd47..460c0fc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -466,18 +466,12 @@ dnl			else
 			fi
 			;;
 		xosd)
-			AC_CHECK_HEADERS([xosd.h],[
-				AC_CHECK_LIB(xosd, main,[
-					LIBXOSD=`xosd-config --libs`
-					DRIVERS="$DRIVERS xosd${SO}"
-					actdrivers=["$actdrivers xosd"]
-				],[
-dnl				else
-					AC_MSG_WARN([The xosd driver needs the xosd library])
-				])
+			AM_PATH_LIBXOSD([
+				DRIVERS="$DRIVERS xosd${SO}"
+				actdrivers=["$actdrivers xosd"]
 			],[
 dnl			else
-				AC_MSG_WARN([The xosd driver needs xosd.h])
+				AC_MSG_WARN([The xosd driver needs the xosd library])
 			])
 			;;
 		*)
diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am
index 8c5ca57..6dc52b7 100644
--- a/server/drivers/Makefile.am
+++ b/server/drivers/Makefile.am
@@ -33,6 +33,7 @@ mdm166a_CFLAGS =     @LIBHID_CFLAGS@ $(AM_CFLAGS)
 picolcd_CFLAGS =     @LIBUSB_CFLAGS@ $(AM_CFLAGS)
 shuttleVFD_CFLAGS =  @LIBUSB_CFLAGS@ $(AM_CFLAGS)
 ula200_CFLAGS =      @LIBFTDI_CFLAGS@ $(AM_CFLAGS)
+xosd_CFLAGS =        @LIBXOSD_CFLAGS@ $(AM_CFLAGS)
 
 bayrad_LDADD =       libLCD.a
 CFontz_LDADD =       libLCD.a libbignum.a
@@ -69,7 +70,7 @@ svga_LDADD =         @LIBSVGA@
 t6963_LDADD =        libLCD.a
 tyan_LDADD =         libLCD.a libbignum.a
 ula200_LDADD =       @LIBFTDI_LIBS@
-xosd_LDADD =         @LIBXOSD@ libbignum.a
+xosd_LDADD =         @LIBXOSD_LIBS@ libbignum.a
 
 libLCD_a_SOURCES =   lcd_lib.h lcd_lib.c
 libbignum_a_SOURCES = adv_bignum.h  adv_bignum.c