diff --git a/Makefile.am b/Makefile.am
index 29fbdcf03d..7d0c775287 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,7 +107,6 @@ src/switch_config.c\
 src/switch_time.c\
 src/switch_odbc.c \
 libs/stfu/stfu.c\
-src/switch_cpp.cpp\
 src/g711.c\
 src/switch_pcm.c\
 libs/libteletone/src/libteletone_detect.c\
@@ -124,6 +123,10 @@ libs/miniupnpc/upnperrors.c \
 libs/libnatpmp/natpmp.c \
 libs/libnatpmp/getgateway.c
 
+if ENABLE_CPP
+libfreeswitch_la_SOURCES += src/switch_cpp.cpp
+endif
+
 library_includedir      = $(PREFIX)/include
 
 library_include_HEADERS = \
diff --git a/configure.in b/configure.in
index a88fa8cff3..e3a2db228d 100644
--- a/configure.in
+++ b/configure.in
@@ -270,6 +270,11 @@ if test "${enable_debug}" = "yes"; then
 
 fi
 
+AC_ARG_ENABLE(cpp,
+[AC_HELP_STRING([--disable-cpp],[build without cpp code])],[enable_cpp="$enableval"],[enable_cpp="yes"])
+
+AM_CONDITIONAL([ENABLE_CPP],[test "${enable_cpp}" = "yes"])
+
 AC_ARG_ENABLE(zrtp,
 	[AS_HELP_STRING([--enable-zrtp], [Compile with zrtp Support])],,[enable_zrtp="no"])
 if test "x$enable_zrtp" = "xyes" ; then