diff --git a/WinQuake/Makefile b/WinQuake/Makefile
index ac0ac70..3580bfc 100644
--- a/WinQuake/Makefile
+++ b/WinQuake/Makefile
@@ -36,10 +36,10 @@ BUILD_RELEASE_DIR=release
 
 CC=gcc -m32
 
-BASE_CFLAGS=-Dstricmp=strcasecmp
+BASE_CFLAGS=-Dstricmp=strcasecmp -I./../dumb/include/ 
 RELEASE_CFLAGS=$(BASE_CFLAGS)
 DEBUG_CFLAGS=$(BASE_CFLAGS) -g
-LDFLAGS=-lm -ldl /usr/local/lib/libdumb.a
+LDFLAGS=-lm -ldl 
 XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
 XCFLAGS=-DX11
 
@@ -78,6 +78,45 @@ targets: $(TARGETS)
 #############################################################################
 
 X11_OBJS = \
+	$(BUILDDIR)/obj/atexit.o \
+   	$(BUILDDIR)/obj/duhlen.o \
+    	$(BUILDDIR)/obj/duhtag.o \
+    	$(BUILDDIR)/obj/dumbfile.o \
+    	$(BUILDDIR)/obj/loadduh.o \
+    	$(BUILDDIR)/obj/makeduh.o \
+    	$(BUILDDIR)/obj/rawsig.o \
+    	$(BUILDDIR)/obj/readduh.o \
+    	$(BUILDDIR)/obj/register.o \
+    	$(BUILDDIR)/obj/rendduh.o \
+    	$(BUILDDIR)/obj/rendsig.o \
+    	$(BUILDDIR)/obj/unload.o \
+    	$(BUILDDIR)/obj/clickrem.o \
+    	$(BUILDDIR)/obj/memfile.o \
+    	$(BUILDDIR)/obj/resample.o \
+    	$(BUILDDIR)/obj/sampbuf.o \
+    	$(BUILDDIR)/obj/silence.o \
+    	$(BUILDDIR)/obj/stdfile.o \
+    	$(BUILDDIR)/obj/itload.o \
+    	$(BUILDDIR)/obj/itread.o \
+    	$(BUILDDIR)/obj/itload2.o \
+    	$(BUILDDIR)/obj/itread2.o \
+    	$(BUILDDIR)/obj/itrender.o \
+    	$(BUILDDIR)/obj/itunload.o \
+    	$(BUILDDIR)/obj/loads3m.o \
+    	$(BUILDDIR)/obj/reads3m.o \
+    	$(BUILDDIR)/obj/loadxm.o \
+    	$(BUILDDIR)/obj/readxm.o \
+    	$(BUILDDIR)/obj/loadmod.o \
+    	$(BUILDDIR)/obj/readmod.o \
+    	$(BUILDDIR)/obj/loads3m2.o \
+    	$(BUILDDIR)/obj/reads3m2.o \
+    	$(BUILDDIR)/obj/loadxm2.o \
+    	$(BUILDDIR)/obj/readxm2.o \
+    	$(BUILDDIR)/obj/loadmod2.o \
+    	$(BUILDDIR)/obj/readmod2.o \
+    	$(BUILDDIR)/obj/xmeffect.o \
+    	$(BUILDDIR)/obj/itorder.o \
+    	$(BUILDDIR)/obj/itmisc.o \
 	$(BUILDDIR)/obj/cl_demo.o \
 	$(BUILDDIR)/obj/cl_input.o \
 	$(BUILDDIR)/obj/cl_main.o \
@@ -180,6 +219,124 @@ X11_OBJS = \
 $(BUILDDIR)/engoo.x11 : $(X11_OBJS)
 	$(CC) $(CFLAGS) -o $@ $(X11_OBJS) $(XLDFLAGS) $(LDFLAGS)
 
+
+$(BUILDDIR)/obj/atexit.o : $(MOUNT_DIR)/../dumb/core/atexit.c
+	$(DO_CC)
+         
+$(BUILDDIR)/obj/duhlen.o : $(MOUNT_DIR)/../dumb/core/duhlen.c
+	$(DO_CC)
+      
+$(BUILDDIR)/obj/duhtag.o : $(MOUNT_DIR)/../dumb/core/duhtag.c
+	$(DO_CC)
+          
+$(BUILDDIR)/obj/dumbfile.o : $(MOUNT_DIR)/../dumb/core/dumbfile.c
+	$(DO_CC)
+      
+$(BUILDDIR)/obj/loadduh.o : $(MOUNT_DIR)/../dumb/core/loadduh.c
+	$(DO_CC)
+        
+$(BUILDDIR)/obj/makeduh.o : $(MOUNT_DIR)/../dumb/core/makeduh.c
+	$(DO_CC)
+        
+$(BUILDDIR)/obj/rawsig.o : $(MOUNT_DIR)/../dumb/core/rawsig.c
+	$(DO_CC)
+          
+$(BUILDDIR)/obj/readduh.o : $(MOUNT_DIR)/../dumb/core/readduh.c
+	$(DO_CC)
+       
+$(BUILDDIR)/obj/register.o : $(MOUNT_DIR)/../dumb/core/register.c
+	$(DO_CC)
+      
+$(BUILDDIR)/obj/rendduh.o : $(MOUNT_DIR)/../dumb/core/rendduh.c
+	$(DO_CC)
+       
+$(BUILDDIR)/obj/rendsig.o : $(MOUNT_DIR)/../dumb/core/rendsig.c
+	$(DO_CC)
+ 
+$(BUILDDIR)/obj/unload.o : $(MOUNT_DIR)/../dumb/core/unload.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/clickrem.o : $(MOUNT_DIR)/../dumb/helpers/clickrem.c
+	$(DO_CC)
+   
+$(BUILDDIR)/obj/memfile.o : $(MOUNT_DIR)/../dumb/helpers/memfile.c
+	$(DO_CC)
+    
+$(BUILDDIR)/obj/resample.o : $(MOUNT_DIR)/../dumb/helpers/resample.c
+	$(DO_CC)
+  
+$(BUILDDIR)/obj/sampbuf.o : $(MOUNT_DIR)/../dumb/helpers/sampbuf.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/silence.o : $(MOUNT_DIR)/../dumb/helpers/silence.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/stdfile.o : $(MOUNT_DIR)/../dumb/helpers/stdfile.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/itload.o : $(MOUNT_DIR)/../dumb/it/itload.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/itread.o : $(MOUNT_DIR)/../dumb/it/itread.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/itload2.o : $(MOUNT_DIR)/../dumb/it/itload2.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/itread2.o : $(MOUNT_DIR)/../dumb/it/itread2.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/itrender.o : $(MOUNT_DIR)/../dumb/it/itrender.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/itunload.o : $(MOUNT_DIR)/../dumb/it/itunload.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/loads3m.o : $(MOUNT_DIR)/../dumb/it/loads3m.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/reads3m.o : $(MOUNT_DIR)/../dumb/it/reads3m.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/loadxm.o : $(MOUNT_DIR)/../dumb/it/loadxm.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/readxm.o : $(MOUNT_DIR)/../dumb/it/readxm.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/loadmod.o : $(MOUNT_DIR)/../dumb/it/loadmod.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/readmod.o : $(MOUNT_DIR)/../dumb/it/readmod.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/loads3m2.o : $(MOUNT_DIR)/../dumb/it/loads3m2.c
+	$(DO_CC)
+       
+$(BUILDDIR)/obj/reads3m2.o : $(MOUNT_DIR)/../dumb/it/reads3m2.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/loadxm2.o : $(MOUNT_DIR)/../dumb/it/loadxm2.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/readxm2.o : $(MOUNT_DIR)/../dumb/it/readxm2.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/loadmod2.o : $(MOUNT_DIR)/../dumb/it/loadmod2.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/readmod2.o : $(MOUNT_DIR)/../dumb/it/readmod2.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/xmeffect.o : $(MOUNT_DIR)/../dumb/it/xmeffect.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/itorder.o : $(MOUNT_DIR)/../dumb/it/itorder.c
+	$(DO_CC)
+
+$(BUILDDIR)/obj/itmisc.o : $(MOUNT_DIR)/../dumb/it/itmisc.c
+	$(DO_CC)
+
 ####
 
 $(BUILDDIR)/obj/cl_demo.o :  $(MOUNT_DIR)/cl_demo.c
diff --git a/WinQuake/tracker_linux.c b/WinQuake/tracker_linux.c
index 0c97bf5..2f8739d 100644
--- a/WinQuake/tracker_linux.c
+++ b/WinQuake/tracker_linux.c
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
-#include <dumb.h>
+#include "dumb.h"
 
 // eukara - added in tracker playback using DUMB - UNIX ONLY!
 char name[256];