diff --git a/engine/Makefile b/engine/Makefile
index f609023f2..fdab36487 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -316,7 +316,7 @@ IMAGELDFLAGS ?= -lpng -ljpeg
 OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg
 
 #BASELDFLAGS=-lm  -lz
-XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext $(IMAGELDFLAGS)
+XLDFLAGS=$(IMAGELDFLAGS)
 
 ifeq ($(FTE_TARGET),vc)
 	WARNINGFLAGS=-W3 -D_CRT_SECURE_NO_WARNINGS
@@ -1372,7 +1372,7 @@ plugins:
 
 plugins-rel:
 	@if test -e ../plugins/Makefile; \
-	then $(MAKE) native -C ../plugins  OUT_DIR="$(RELEASE_DIR)" CC="$(CC) $(W32_CFLAGS) $(RELEASE_CFLAGS)" BASE_CFLAGS="$(BASE_CFLAGS)"; \
+	then $(MAKE) native -C ../plugins  OUT_DIR="$(RELEASE_DIR)" CC="$(CC) $(W32_CFLAGS) $(RELEASE_CFLAGS)" BASE_CFLAGS="$(BASE_CFLAGS)" FTE_TARGET="$(FTE_TARGET)"; \
 	 else echo no plugins directory installed; \
 	fi
 plugins-rel:
diff --git a/engine/common/plugin.c b/engine/common/plugin.c
index 421315dc6..0a1c739f3 100644
--- a/engine/common/plugin.c
+++ b/engine/common/plugin.c
@@ -1513,7 +1513,7 @@ void Plug_Initialise(qboolean fromgamedir)
 	if (!fromgamedir)
 	{
 		FS_NativePath("", FS_BINARYPATH, nat, sizeof(nat));
-		Sys_EnumerateFiles(nat, "fteplug_*"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, Plug_EnumeratedRoot, NULL, NULL);
+		Sys_EnumerateFiles(nat, "fteplug_*"ARCH_DL_POSTFIX, Plug_EnumeratedRoot, NULL, NULL);
 	}
 	if (fromgamedir)
 	{