diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index eec0f84cf5..294384ced3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-20 08:18 GMT Dave Pearson <davep@davep.org>
+   * source/rtl/gtsln/Makefile
+   * source/rtl/gtsln/gtsln.c
+   * source/rtl/gtsln/kbsln.c
+     * Applied fixes from Marek Paliwoda <paliwoda@inetia.pl> that lets
+       the slang GT driver code build on different GNU/Linux distributions
+       (and possibly other flavours of Un*x).
+	
 2001-11-20 05:20 GMT+0700 Andi Jahja <harbour@cbn.net.id>
    * source/compiler/harbour.y
      ! declare function prototype __yy_memcpy() to satisfy Borland
diff --git a/harbour/source/rtl/gtsln/Makefile b/harbour/source/rtl/gtsln/Makefile
index 571ff90968..c74c0da7ea 100644
--- a/harbour/source/rtl/gtsln/Makefile
+++ b/harbour/source/rtl/gtsln/Makefile
@@ -12,3 +12,12 @@ C_SOURCES=\
 LIBNAME=gtsln
 
 include $(TOP)$(ROOT)config/lib.cf
+
+# a workaround of a problem with different include directories 
+# for slang header files between different unix distributions
+DUMMYA  := $(CFLAGS)
+CFLAGS := -I/usr/include/slang -I/usr/local/include \
+	  -I/usr/local/include/slang $(DUMMYA)
+
+#DUMMYB  := $(LDFLAGS)
+#LDFLAGS := -L/usr/lib/slang -L/usr/local/lib -L/usr/local/lib/slang $(DUMMYB)
\ No newline at end of file
diff --git a/harbour/source/rtl/gtsln/gtsln.c b/harbour/source/rtl/gtsln/gtsln.c
index 19e7eb3bfb..328c78d79a 100644
--- a/harbour/source/rtl/gtsln/gtsln.c
+++ b/harbour/source/rtl/gtsln/gtsln.c
@@ -54,11 +54,7 @@
 
 /* *********************************************************************** */
 
-#ifdef __linux__
-   #include <slang/slang.h>
-#else
-   #include <slang.h>
-#endif
+#include <slang.h>
 
 /* missing defines in previous versions of Slang - this can not work ! */
 #if SLANG_VERSION < 10400
diff --git a/harbour/source/rtl/gtsln/kbsln.c b/harbour/source/rtl/gtsln/kbsln.c
index c854d2795e..bc80aa150e 100644
--- a/harbour/source/rtl/gtsln/kbsln.c
+++ b/harbour/source/rtl/gtsln/kbsln.c
@@ -54,12 +54,7 @@
 
 /* *********************************************************************** */
 
-#ifdef __linux__
-   #include <slang/slang.h>
-#else
-   #include <slang.h>
-#endif
-
+#include <slang.h>
 #include <sys/ioctl.h>
 
 #ifdef M_UNIX