diff --git a/include/vorbis/OpenMPT.txt b/include/vorbis/OpenMPT.txt
index 5d3df0a97cc..50e52c2c9a6 100644
--- a/include/vorbis/OpenMPT.txt
+++ b/include/vorbis/OpenMPT.txt
@@ -4,7 +4,7 @@ The following changes have been made:
   symbian, test, vq) have been removed.
 - https://github.com/xiph/vorbis/pull/100 and
   https://github.com/xiph/vorbis/pull/101 have been applied.
-- A GCC warning in lib/lpc.c has been silenced.
+- GCC warnings in lib/lpc.c and lib/psy.c have been silenced.
 - All modifications have been marked with /* OpenMPT */.
 - For building, premake is used to generate Visual Studio project files.
   See ../build/premake/ for details.
diff --git a/include/vorbis/lib/psy.c b/include/vorbis/lib/psy.c
index 036b094aa76..47a171dcf00 100644
--- a/include/vorbis/lib/psy.c
+++ b/include/vorbis/lib/psy.c
@@ -711,8 +711,15 @@ void _vp_noisemask(vorbis_look_psy *p,
 
   for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i];
 
+#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER)  /* OpenMPT */
+#pragma GCC diagnostic push  /* OpenMPT */
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"  /* OpenMPT */
+#endif  /* OpenMPT */
   bark_noise_hybridmp(n,p->bark,work,logmask,0.,
                       p->vi->noisewindowfixed);
+#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER)  /* OpenMPT */
+#pragma GCC diagnostic pop  /* OpenMPT */
+#endif  /* OpenMPT */
 
   for(i=0;i<n;i++)work[i]=logmdct[i]-work[i];