diff --git a/daemon/escape.c b/daemon/escape.c
index 1d4e0ccd..727ffdb9 100644
--- a/daemon/escape.c
+++ b/daemon/escape.c
@@ -50,6 +50,7 @@ void escape(const char ** src_ptr, char ** dst_ptr, unsigned int flags)
       {
         break;
       }
+      /* fall through intentionally, some compilers are parsing comments */
     case '<':               /* invalid attribute value char (XML spec) */
     case '&':               /* invalid attribute value char (XML spec) */
     case '"':               /* we store attribute values in double quotes - invalid attribute value char (XML spec) */
diff --git a/wscript b/wscript
index a7594716..a785f34f 100644
--- a/wscript
+++ b/wscript
@@ -224,6 +224,9 @@ def configure(conf):
     if not conf.env['BUILD_PYLASH']:
        add_cflag(conf, '-Wextra')
        conf.env.append_unique('CXXFLAGS', '-Wno-unused-parameter') # the UNUSED() macro doesnt work for C++
+
+    add_cflag(conf, '-Wimplicit-fallthrough=2')
+
     if conf.env['BUILD_WERROR']:
         add_cflag(conf, '-Werror')
         # for pre gcc-4.4, enable optimizations so use of uninitialized variables gets detected