diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index a5723a3..1787656 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -86,7 +86,7 @@
                   src/generate/t_go_generator.cc
 
 thrift_CPPFLAGS = -I$(srcdir)/src
-thrift_CXXFLAGS = -Wall
+thrift_CXXFLAGS = -Wall -Wextra -std=c++0x -pedantic
 thrift_LDADD = @LEXLIB@ libparse.a
 
 libparse_a_CPPFLAGS = -I$(srcdir)/src
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index f8093ba..55124ac 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -40,7 +40,7 @@
 pkgconfig_DATA += thrift-z.pc
 endif
 
-AM_CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall -Wextra -std=c++0x -pedantic
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/src
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 
diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am
index 1626c6e..a428cd9 100644
--- a/lib/cpp/test/Makefile.am
+++ b/lib/cpp/test/Makefile.am
@@ -182,7 +182,7 @@
 
 AM_CPPFLAGS = $(BOOST_CPPFLAGS)
 AM_LDFLAGS = $(BOOST_LDFLAGS)
-AM_CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall -Wextra -std=c++0x -pedantic
 
 clean-local:
 	$(RM) -r gen-cpp
diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am
index 95574fc..b7ef15b 100755
--- a/test/cpp/Makefile.am
+++ b/test/cpp/Makefile.am
@@ -96,7 +96,7 @@
 	-I$(top_srcdir)/lib/cpp/src -Igen-cpp
 
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
-AM_CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall -Wextra -std=c++0x -pedantic
 AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
 
 clean-local: