diff --git a/src/crypto/Makefile.am b/src/crypto/Makefile.am
index be203c4..53c99a5 100644
--- a/src/crypto/Makefile.am
+++ b/src/crypto/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
+AM_CXXFLAGS = -pedantic -Wno-long-long -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 
 noinst_LIBRARIES = libmoshcrypto.a
 
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index dfef259..c88e4b6 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
+AM_CXXFLAGS = -pedantic -Wno-long-long -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 
 noinst_PROGRAMS = encrypt decrypt ntester parse termemu
 
diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
index ce84fec..ada7508 100644
--- a/src/frontend/Makefile.am
+++ b/src/frontend/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I$(builddir)/../protobufs -I$(srcdir)/../util
-AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
+AM_CXXFLAGS = -pedantic -Wno-long-long -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 LIBS = $(protobuf_lite_LIBS)
 LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lutil -lrt -lm -lutempter
 
diff --git a/src/network/Makefile.am b/src/network/Makefile.am
index 0d80315..e3f977f 100644
--- a/src/network/Makefile.am
+++ b/src/network/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../crypto -I$(builddir)/../protobufs
-AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
+AM_CXXFLAGS = -pedantic -Wno-long-long -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 
 noinst_LIBRARIES = libmoshnetwork.a
 
diff --git a/src/protobufs/Makefile.am b/src/protobufs/Makefile.am
index 9e0857b..2897547 100644
--- a/src/protobufs/Makefile.am
+++ b/src/protobufs/Makefile.am
@@ -2,7 +2,7 @@ source = userinput.proto hostinput.proto transportinstruction.proto
 
 PROTOC = protoc
 AM_CPPFLAGS = $(protobuf_lite_CFLAGS)
-AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -fno-default-inline -pipe
+AM_CXXFLAGS = -pedantic -Wno-long-long -Werror -Wall -Wextra -fno-default-inline -pipe
 
 SUFFIXES = .proto .pb.cc
 
diff --git a/src/statesync/Makefile.am b/src/statesync/Makefile.am
index b477bd4..e87ead8 100644
--- a/src/statesync/Makefile.am
+++ b/src/statesync/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(srcdir)/../terminal -I$(builddir)/../protobufs
-AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
+AM_CXXFLAGS = -pedantic -Wno-long-long -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 
 noinst_LIBRARIES = libmoshstatesync.a
 
diff --git a/src/terminal/Makefile.am b/src/terminal/Makefile.am
index cc3ec6a..92a00e7 100644
--- a/src/terminal/Makefile.am
+++ b/src/terminal/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(srcdir)/../util
-AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
+AM_CXXFLAGS = -pedantic -Wno-long-long -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 
 noinst_LIBRARIES = libmoshterminal.a
 
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 14f02f9..de63bca 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
+AM_CXXFLAGS = -pedantic -Wno-long-long -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 
 noinst_LIBRARIES = libmoshutil.a