diff --git a/ChangeLog b/ChangeLog
index bbae4c39..472f292c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,5 @@
 Wed Aug  7 08:17:40 CEST 2013
-	Removing dependency on liberty, use rand instead of 
-	random in test. -MC
+	Removing dependency on PlibC. -MC
 
 Fri Aug  2 20:55:47 CEST 2013
 	Fix HTTP 1.1 compliance with respect to not returning
diff --git a/configure.ac b/configure.ac
index 43f5234d..1f472830 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,12 @@ netbsd*)
      AM_CONDITIONAL(HAVE_W32, true)    
      LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols -lws2_32"
      AM_CONDITIONAL(HAVE_GNU_LD, true)    
+     # check if PlibC is available
+     CHECK_PLIBC
+     LIBS="$PLIBC_LIBS $LIBS"
+     AC_SUBST(PLIBC_LIBS)
+     AC_SUBST(PLIBC_LDFLAGS)
+     AC_SUBST(PLIBC_CPPFLAGS)
      ;;
 *openedition*)
      AC_DEFINE_UNQUOTED(OS390,1,[This is a OS/390 system])
@@ -219,6 +225,10 @@ AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h netdb.h netinet/in.h netinet/
 
 AC_CHECK_HEADERS([search.h], AM_CONDITIONAL(HAVE_TSEARCH, true), AM_CONDITIONAL(HAVE_TSEARCH, false))
 
+# Check for plibc.h from system, if not found, use our own
+AC_CHECK_HEADERS([plibc.h],our_private_plibc_h=0,our_private_plibc_h=1)
+AM_CONDITIONAL(USE_PRIVATE_PLIBC_H, test x$our_private_plibc_h = x1)    
+
 AC_CHECK_FUNCS_ONCE(memmem)
 AC_CHECK_FUNCS_ONCE(accept4)
 
@@ -550,6 +560,7 @@ doc/examples/Makefile
 m4/Makefile
 src/Makefile
 src/include/Makefile
+src/include/plibc/Makefile
 src/microhttpd/Makefile
 src/microspdy/Makefile
 src/spdy2http/Makefile
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index c1bbb451..4cfc7be7 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,6 +1,11 @@
 SUBDIRS  = .
 
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
 AM_CPPFLAGS = \
+  $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
   @LIBGCRYPT_CFLAGS@
 
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 5dbd52ef..6a2f31b5 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,6 +1,11 @@
 SUBDIRS  = .
 
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
 AM_CPPFLAGS = \
+  $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
   @LIBGCRYPT_CFLAGS@
 
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 66761396..cce55616 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = .
+SUBDIRS = plibc .
 
 if ENABLE_SPDY
 microspdy = microspdy.h
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index b4d8663f..4ff623ae 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -1,7 +1,12 @@
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
 AM_CPPFLAGS = \
+  $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
   -I$(top_srcdir)/src/daemon \
-  @LIBGCRYPT_CFLAGS@
+  @LIBGCRYPT_CFLAGS@ 
 
 EXTRA_DIST = EXPORT.sym
 
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index fd4696e7..b83983e8 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -8,7 +8,12 @@ if ENABLE_HTTPS
   SUBDIRS += https
 endif
 
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
 AM_CPPFLAGS = \
+  $(PLIBC_INCLUDE) \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/daemon \
 -I$(top_srcdir)/src/include \
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index 0bcc5569..1a1cc232 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -4,7 +4,12 @@ if USE_COVERAGE
   AM_CFLAGS = --coverage
 endif
 
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
 AM_CPPFLAGS = \
+  $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
   -I$(top_srcdir)/src/microhttpd \
   $(LIBCURL_CPPFLAGS)
diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am
index 6c908339..2b72f404 100644
--- a/src/testzzuf/Makefile.am
+++ b/src/testzzuf/Makefile.am
@@ -4,7 +4,11 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-INCLUDES = -I$(top_srcdir)/src/include
+if USE_PRIVATE_PLIBC_H
+ PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
+endif
+
+INCLUDES = $(PLIBC_INCLUDE) -I$(top_srcdir)/src/include
 
 EXTRA_DIST = README socat.c