diff -ruN linux-heretic-0.9.5.orig/Makefile linux-heretic-0.9.5/Makefile
--- linux-heretic-0.9.5.orig/Makefile	Sat Feb 13 02:05:54 1999
+++ linux-heretic-0.9.5/Makefile	Sat Feb 13 20:12:06 1999
@@ -13,7 +13,7 @@
 
 # Uncomment the line below if you want to use GSI for sound.
 # (doesn't really work yet. :-()
-#WANT_GSI = yes
+WANT_GSI = yes
 
 
 # Plattform specific definitions
@@ -53,7 +53,11 @@
 
 X_LDFLAGS = -L/usr/X11R6/lib
 
+ifeq ($(WANT_GSI),yes)
+X11LIBS = -lXext -lX11 -lm
+else
 X11LIBS = -lXext -lX11
+endif
 GGILIBS = -lggi -lm
 VGALIBS = -lvga -lm
 
Binary files linux-heretic-0.9.5.orig/core and linux-heretic-0.9.5/core differ
diff -ruN linux-heretic-0.9.5.orig/gsisound/i_sound.c linux-heretic-0.9.5/gsisound/i_sound.c
--- linux-heretic-0.9.5.orig/gsisound/i_sound.c	Thu Feb 11 01:53:00 1999
+++ linux-heretic-0.9.5/gsisound/i_sound.c	Sun Feb 14 20:26:33 1999
@@ -103,6 +103,7 @@
 
 
 
+extern char *wadfiles[];
 /*
  * This function loads the sound data from the WAD lump,
  *  for single sound.
@@ -134,7 +135,7 @@
     
     /* Andre: this should be fixed ! */
 
-    gsi_load_raw_sample(sfx_id, "heretic.wad", lumpinfo[sfxlump].position +8, 
+    gsi_load_raw_sample(sfx_id, /*"heretic.wad"*/ wadfiles[0], lumpinfo[sfxlump].position +8, 
 			size-8, 11025, 1, GSI_8BIT);
     gsi_flush();
 
@@ -603,22 +604,26 @@
     return;
 }
 
-
 void I_InitSound()
 { 
     int  i;
-    
+
     if (gsi_init(NULL)) {
 	fprintf(stderr, "GSI: unable to connect to server\n");
 	return;
     }
     
     /* Andre: This should be fixed ! */
-	
-	doomwaddir=strdup("./");
 
-	/* ptr = getcwd(doomwaddir, 256); longer and you're screwed
-	if (ptr==NULL) { perror("getcwd"); exit(1); } */
+	/* WHS: It was ok before your changes in this and other files :-)
+	 * Now it works again. This code is needed to let the server know where
+	 * (i.e. an absolute directory name) we load the sound data from.
+	 */
+
+	doomwaddir= (char *) malloc(256);
+
+	ptr = getcwd(doomwaddir, 256); /* longer and you're screwed */
+	if (ptr==NULL) { perror("getcwd"); exit(1); }
 	fprintf(stderr, "doomwaddir: %s\n", doomwaddir);
     
     gsi_chdir(doomwaddir);
diff -ruN linux-heretic-0.9.5.orig/gsisound/soundst.c linux-heretic-0.9.5/gsisound/soundst.c
--- linux-heretic-0.9.5.orig/gsisound/soundst.c	Wed Feb 10 18:05:37 1999
+++ linux-heretic-0.9.5/gsisound/soundst.c	Sun Feb 14 20:25:49 1999
@@ -127,7 +127,7 @@
 
 void S_StopChannel(int cnum);
 
-
+extern char *wadfiles[];
 /*
  * Initializes sound stuff, including volume
  * Sets channels, SFX and music volume,
@@ -182,7 +182,7 @@
 	
 	/* Andre: this should be fixed soon. */
 	chdir(doomwaddir);
-	fd = open("heretic.wad", O_RDONLY);
+	fd = open(/*"heretic.wad"*/ wadfiles[0], O_RDONLY);
 	
 	
 
Binary files linux-heretic-0.9.5.orig/heretic.wad and linux-heretic-0.9.5/heretic.wad differ