diff --git a/AMBuildScript b/AMBuildScript
index ff93bf51..84a37f7a 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -215,10 +215,7 @@ class MMSConfig(object):
         '-fPIC',
       ]
 
-      if cxx.version == 'apple-clang-6.0' or cxx.version == 'clang-3.4':
-        cxx.cxxflags += ['-std=c++1y']
-      else:
-        cxx.cxxflags += ['-std=c++14']
+      cxx.cxxflags += ['-std=c++17']
       if (cxx.version >= 'gcc-4.0') or cxx.family == 'clang':
         cxx.cflags += ['-fvisibility=hidden']
         cxx.cxxflags += ['-fvisibility-inlines-hidden']
@@ -228,6 +225,7 @@ class MMSConfig(object):
         '-fno-threadsafe-statics',
         '-Wno-non-virtual-dtor',
         '-Wno-overloaded-virtual',
+        '-Wno-register',
       ]
       if (cxx.version >= 'gcc-4.7' or cxx.family == 'clang'):
         cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
@@ -265,6 +263,7 @@ class MMSConfig(object):
       cxx.cflags += [
         '/W3',
         '/Zi',
+        '/std:c++17',
       ]
       cxx.cxxflags += ['/TP']