diff --git a/BUGS b/BUGS
index 48ec135..bc3b07a 100644
--- a/BUGS
+++ b/BUGS
@@ -7,8 +7,6 @@ V0.5dev:
     a non full block from the vBar. Affected drivers: IOWarrior, CwLinux
   - On Solaris the mtc_s16209x driver fails to compile. Configure LCDproc to
     exclude this driver.
-  - On FreeBSD drivers using the pthread library are known not to work.
-    Currently affected are the lis and xosd driver.
 
 
 Bugs in previous versions (not checked if the still exist):
diff --git a/ChangeLog b/ChangeLog
index ccafbd9..d7dec11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ v0.5dev (ongoing development)
  + glcd driver: Add FreeType 2 rendering support (B. Walle and M. Dolze)
  + glcd driver: New connection type PNG, writes framebuffer as PNG image
  + hd44780: Fix vBars and block icon not working correctly on the same screen
+ * Build system: Link LCDd itself with pthread library if available
 
 v0.5.5
  + sed1330 driver: Add support for HG25504 (L. Lagendijk)
diff --git a/server/Makefile.am b/server/Makefile.am
index 26a5d0a..2160a47 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -6,7 +6,7 @@ sbin_PROGRAMS=LCDd
 
 LCDd_SOURCES= client.c client.h clients.c clients.h input.c input.h main.c main.h menuitem.c menuitem.h menu.c menu.h menuscreens.c menuscreens.h parse.c parse.h render.c render.h screen.c screen.h screenlist.c screenlist.h serverscreens.c serverscreens.h sock.c sock.h widget.c widget.h drivers.c drivers.h driver.c driver.h
 
-LDADD = ../shared/libLCDstuff.a commands/libLCDcommands.a
+LDADD = ../shared/libLCDstuff.a commands/libLCDcommands.a @LIBPTHREAD_LIBS@
 
 if !DARWIN
 AM_LDFLAGS = -rdynamic -uget_args