diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
new file mode 100644
index 000000000..af437a64d
--- /dev/null
+++ b/lib/cpp/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = src
diff --git a/lib/cpp/bootstrap.sh b/lib/cpp/bootstrap.sh
new file mode 100755
index 000000000..826bf3b35
--- /dev/null
+++ b/lib/cpp/bootstrap.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+autoscan
+autoheader
+aclocal
+libtoolize --force
+touch NEWS README AUTHORS ChangeLog
+autoconf
+automake -ac
diff --git a/lib/cpp/configure.ac b/lib/cpp/configure.ac
new file mode 100644
index 000000000..679e26fd9
--- /dev/null
+++ b/lib/cpp/configure.ac
@@ -0,0 +1,57 @@
+AC_PREREQ(2.59)
+
+AC_INIT(thrift, 1.0)
+
+AC_CONFIG_SRCDIR(src/Thrift.h)
+
+AM_INIT_AUTOMAKE
+
+AC_CHECK_FUNCS([gethostbyname])
+
+AC_CHECK_FUNCS([gettimeofday])
+
+AC_CHECK_FUNCS([memset])
+
+AC_CHECK_FUNCS([socket])
+
+AC_CHECK_HEADERS([arpa/inet.h])
+
+AC_CHECK_HEADERS([inttypes.h])
+
+AC_CHECK_HEADERS([netdb.h])
+
+AC_CHECK_HEADERS([netinet/in.h])
+
+AC_CHECK_HEADERS([pthread.h])
+
+AC_CHECK_HEADERS([stddef.h])
+
+AC_CHECK_HEADERS([sys/socket.h])
+
+AC_CHECK_HEADERS([sys/time.h])
+
+AC_CHECK_HEADERS([unistd.h])
+
+AC_C_CONST
+
+AC_C_VOLATILE
+
+AC_HEADER_STDBOOL
+
+AC_HEADER_STDC
+
+AC_HEADER_TIME
+
+AC_TYPE_SIZE_T
+
+AC_CONFIG_HEADERS(config.h:config.hin)
+
+AC_PROG_CC
+
+AC_PROG_CXX
+
+AC_PROG_INSTALL
+
+AC_PROG_LIBTOOL
+
+AC_OUTPUT([Makefile src/Makefile src/concurrency/Makefile])
diff --git a/lib/cpp/src/Makefile.am b/lib/cpp/src/Makefile.am
new file mode 100644
index 000000000..3d07cb405
--- /dev/null
+++ b/lib/cpp/src/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = concurrency
diff --git a/lib/cpp/src/concurrency/Makefile.am b/lib/cpp/src/concurrency/Makefile.am
new file mode 100644
index 000000000..c4d08291a
--- /dev/null
+++ b/lib/cpp/src/concurrency/Makefile.am
@@ -0,0 +1,10 @@
+lib_LTLIBRARIES = libconcurrency.la
+
+# Define the source file for the module
+
+libconcurrency_la_SOURCES = Monitor.cc \
+			   PosixThreadFactory.cc \
+			   ThreadManager.cc \
+			   TimerManager.cc
+
+