diff --git a/mstflint-gcc7.patch b/mstflint-gcc7.patch
new file mode 100644
index 0000000..3effe8c
--- /dev/null
+++ b/mstflint-gcc7.patch
@@ -0,0 +1,12 @@
+diff --git configure.ac configure.ac
+index f988818..8384528 100644
+--- configure.ac
++++ configure.ac
+@@ -98,6 +98,7 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [
+   LDFLAGS="$LDFLAGS -Wl,--dynamic-linker=/lib64/ld64.so.2"
+ ])
+ 
++CPPFLAGS="$CPPFLAGS -Wno-implicit-fallthrough"
+ CFLAGS="$CFLAGS -Werror -DMST_UL"
+ CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"
+ 
diff --git a/mstflint.changes b/mstflint.changes
index 97d01a5..b52b8cd 100644
--- a/mstflint.changes
+++ b/mstflint.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 30 12:21:38 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Add mstflint-gcc7.patch for GCC7 support
+
 -------------------------------------------------------------------
 Thu May 18 05:54:00 UTC 2017 - nmoreychaisemartin@suse.com
 
diff --git a/mstflint.spec b/mstflint.spec
index 7f622ae..c810e7f 100644
--- a/mstflint.spec
+++ b/mstflint.spec
@@ -38,6 +38,8 @@ Patch2:         mstflint-4.4.0-implicit-declaration.patch
 Patch3:         mstflint-4.4.0-no-date-time.patch
 # PATCH-FIX-UPSTREAM Add all needed defines to get it built on armv7
 Patch4:         mstflint-armv7_arch.patch
+# PATCH-FIX-UPSTREAM Ignore fallthrough for GCC7 support
+Patch5:         mstflint-gcc7.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  libibmad-devel
@@ -61,6 +63,7 @@ the downloads page at the Mellanox web site.
 %patch2
 %patch3
 %patch4
+%patch5
 
 %build
 ./autogen.sh