diff --git a/Makefile.am b/Makefile.am
index fdd269f..9bd334d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,10 @@
 
 bin_PROGRAMS=httpfs
 
-httpfs_LDADD=$(LIBS) -lhurdbugaddr -lnetfs -lfshelp -lthreads -lports -liohelp -lshouldbeinlibc
+# XXX At some point, we are using libpthread, and this causes httpfs to crash:
+# httpfs: ./pthread/../sysdeps/generic/pt-mutex-timedlock.c:68: __pthread_mutex_timedlock_internal: Assertion `__pthread_threads' failed.
+# Linking httpfs with libpthread is a workaround.
+httpfs_LDADD= -lpthread $(LIBS) -lhurdbugaddr -lnetfs -lfshelp -lthreads -lports -liohelp -lshouldbeinlibc
 httpfs_SOURCES=httpfs.c \
 	netfs.c \
 	args.c \