diff --git a/GNUmakefile b/GNUmakefile
index 79aafe65..f7aa7c61 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -297,7 +297,7 @@ ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),)
   else
     CXXFLAGS += -DCRYPTOPP_DISABLE_SSE2
   endif
-  
+
   # https://github.com/weidai11/cryptopp/issues/738
   UNUSED := $(shell rm -f a.out && rm -rf *.out.dSYM/)
 
diff --git a/config.h b/config.h
index 91a9db47..774c4815 100644
--- a/config.h
+++ b/config.h
@@ -1175,9 +1175,11 @@ NAMESPACE_END
 // Clang and __EXCEPTIONS see http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html
 #if defined(__clang__)
 # if __EXCEPTIONS && __has_feature(cxx_exceptions)
-#  define CRYPTOPP_CXX17_EXCEPTIONS 1
+#  if __cpp_lib_uncaught_exceptions
+#   define CRYPTOPP_CXX17_EXCEPTIONS 1
+#  endif
 # endif
-#elif (CRYPTOPP_MSC_VERSION >= 1900) || (__INTEL_COMPILER >= 1800) || (CRYPTOPP_GCC_VERSION >= 60000)
+#elif (CRYPTOPP_MSC_VERSION >= 1900) || (__INTEL_COMPILER >= 1800) || (CRYPTOPP_GCC_VERSION >= 60000) || (__cpp_lib_uncaught_exceptions)
 # define CRYPTOPP_CXX17_EXCEPTIONS 1
 #endif // uncaught_exceptions compilers