diff --git a/CMakeLists.txt b/CMakeLists.txt
index 607b2c4c80..8673729236 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
 endif(CMAKE_COMPILER_IS_GNUCC)
 
 if(CMAKE_COMPILER_IS_CLANG)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough")
     set(CMAKE_C_FLAGS_RELEASE     "-O2")
     set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")
     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
diff --git a/ChangeLog b/ChangeLog
index d10791f4f7..f74ba34444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@ Bugfix
      with make.
    * Fix link error when building shared libraries for Windows with make.
    * Fix error when loading libmbedtls.so.
+   * Fix bug in mbedtls_ssl_conf_default() that caused the default preset to
+     be always used (found by dcb314) (#235)
 
 Changes
    * The PEM parser now accepts a trailing space at end of lines (#226).
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 4938964b75..9007562fb5 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6836,6 +6836,7 @@ int mbedtls_ssl_config_defaults( mbedtls_ssl_config *conf,
 #if defined(MBEDTLS_ECP_C)
             conf->curve_list = ssl_preset_suiteb_curves;
 #endif
+            break;
 
         /*
          * Default