diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
index 8b764ba25..21cf93155 100644
--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -159,6 +159,11 @@ include_HEADERS = 				\
 	xdbm.h					\
 	$(XHEADERS) 
 
+if have_socket_wrapper
+libroken_la_SOURCES += socket_wrapper.c socket_wrapper.h
+include_HEADERS += socket_wrapper.h
+endif
+
 build_HEADERZ = test-mem.h
 
 nodist_include_HEADERS = roken.h
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 95d720dd6..0c1e666bd 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -693,4 +693,8 @@ int ROKEN_LIB_FUNCTION
 closefrom(int);
 #endif
 
+#ifdef SOCKET_WRAPPER_REPLACE
+#include <socket_wrapper.h>
+#endif
+
 ROKEN_CPP_END