diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
index 1be9be490..e369a0795 100644
--- a/generate/templates/templates/binding.gyp
+++ b/generate/templates/templates/binding.gyp
@@ -98,16 +98,9 @@
           }
         ],
         [
-          "OS=='linux' and '<!(echo \"$CXX\")'=='clang++'", {
+          "OS=='linux' or OS.endswith('bsd')", {
             "cflags": [
-              "-Wno-c++11-extensions"
-            ]
-          }
-        ],
-        [
-          "OS=='linux' and '<!(echo \"$CXX\")'!='clang++'", {
-            "cflags": [
-              "-std=c++0x"
+              "-std=c++11"
             ]
           }
         ]
diff --git a/vendor/openssl/openssl.gyp b/vendor/openssl/openssl.gyp
index 0cb4332fe..66ef8b1a1 100644
--- a/vendor/openssl/openssl.gyp
+++ b/vendor/openssl/openssl.gyp
@@ -152,7 +152,7 @@
           }],
         ]
       }],
-      ['is_clang==1 or gcc_version>=43', {
+      ['gcc_version>=43', {
         'cflags': ['-Wno-old-style-declaration'],
       }],
       ['OS=="solaris"', {