diff --git a/quakespasm/Quake/Makefile b/quakespasm/Quake/Makefile
index 4a6e773b..830e0b06 100644
--- a/quakespasm/Quake/Makefile
+++ b/quakespasm/Quake/Makefile
@@ -18,7 +18,7 @@ USE_CODEC_WAVE=1
 USE_CODEC_FLAC=0
 USE_CODEC_MP3=1
 USE_CODEC_VORBIS=1
-USE_CODEC_OPUS=0
+USE_CODEC_OPUS=1
 # either mikmod or xmp
 USE_CODEC_MIKMOD=0
 USE_CODEC_XMP=0
@@ -74,6 +74,8 @@ define do_strip
 endef
 endif
 
+CFLAGS += $(QSS_CFLAGS)
+LDFLAGS += $(QSS_LDFLAGS)
 ifeq ($(DO_USERDIRS),1)
 CFLAGS += -DDO_USERDIRS=1
 endif
@@ -158,6 +160,7 @@ ifeq ($(USE_CODEC_OPUS),1)
 CFLAGS+= -DUSE_CODEC_OPUS
 CFLAGS+= $(shell pkg-config --cflags opusfile)
 CODECLIBS+= $(shell pkg-config --libs   opusfile)
+CODECLIBS+= $(shell pkg-config --libs   opus)
 endif
 ifeq ($(USE_CODEC_VORBIS),1)
 CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec)
diff --git a/quakespasm/Quake/common.c b/quakespasm/Quake/common.c
index b9fd3298..c9eba468 100644
--- a/quakespasm/Quake/common.c
+++ b/quakespasm/Quake/common.c
@@ -27,8 +27,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <errno.h>
 
 #ifndef _WIN32
-#include <dirent.h>
-#include <fnmatch.h>
+	#include <dirent.h>
+	#include <fnmatch.h>
+	#ifndef FNM_CASEFOLD
+		#define FNM_CASEFOLD 0	//not available. I guess we're not on gnu/linux
+	#endif
 #endif
 
 static char	*largv[MAX_NUM_ARGVS + 1];
diff --git a/quakespasm/Quake/snd_voip.c b/quakespasm/Quake/snd_voip.c
index 2b18bc9e..623aede4 100644
--- a/quakespasm/Quake/snd_voip.c
+++ b/quakespasm/Quake/snd_voip.c
@@ -1320,7 +1320,7 @@ static struct
 #define OPUS_SET_BITRATE_REQUEST			4002
 #define OPUS_RESET_STATE					4028
 #ifdef OPUS_STATIC
-#include <opus/opus.h>
+#include <opus.h>
 #define qopus_encoder_create	opus_encoder_create
 #define qopus_encoder_destroy	opus_encoder_destroy
 #define qopus_encoder_ctl		opus_encoder_ctl
diff --git a/quakespasm/Quakespasm-Spiked.txt b/quakespasm/Quakespasm-Spiked.txt
old mode 100755
new mode 100644
index 6569b8cf..b2044cc0
--- a/quakespasm/Quakespasm-Spiked.txt
+++ b/quakespasm/Quakespasm-Spiked.txt
@@ -208,6 +208,19 @@ QuakeSpasm-Spiked
 
   o  Additional code and binaries are released under the same license.
 
+  o  The public linux build statically links against various common libraries
+     in order to reduce version conflicts (compiled on a Debian 8/Jessie system).
+     For system integration, it still requires the SDL 1.2 package from your distro.
+
+     . libjpeg 9b
+     . libz 1.2.11
+     . libpng 1.6.34
+     . lobogg 1.3.3
+     . libvorbis[file] 1.3.5
+     . libopus 1.3-beta
+     . libopusfile 0.9
+     . libmad 0.15.1b
+
   -------------------
   6.  Links / Contact