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