diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 980bae48a..239af569e 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -45,6 +45,8 @@ if CAIRO_HAS_WIN32_SURFACE
 libcairoboilerplate_la_LIBADD += -lwinspool
 endif
 
+libcairoboilerplate_la_LIBADD += $(CAIROBOILERPLATE_LIBS)
+
 test: check
 
 if CROSS_COMPILING
diff --git a/build/configure.ac.system b/build/configure.ac.system
index 01a6a0a8d..46909ad02 100644
--- a/build/configure.ac.system
+++ b/build/configure.ac.system
@@ -56,6 +56,10 @@ AC_CHECK_LIB(rt, shm_open, [
 AM_CONDITIONAL(HAVE_SHM, test "x$has_shm_open" = "xyes")
 AC_SUBST(SHM_LIBS)
 
+AC_CHECK_LIB(socket, connect, [SOCKET_LIBS=-lsocket], [SOCKET_LIBS=])
+CAIROBOILERPLATE_LIBS=$SOCKET_LIBS
+AC_SUBST(CAIROBOILERPLATE_LIBS)
+
 dnl ====================================================================
 dnl Header/function checks
 dnl ====================================================================