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)