diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 79411a94d..bf1003f23 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fluid.cxx,v 1.15.2.13.2.9 2001/10/29 21:59:14 easysw Exp $"
+// "$Id: fluid.cxx,v 1.15.2.13.2.10 2001/12/21 18:16:50 easysw Exp $"
 //
 // FLUID main entry for the Fast Light Tool Kit (FLTK).
 //
@@ -77,6 +77,9 @@ extern int snprintf(char* str, size_t size, const char* fmt, ...);
 #else
 #  include <unistd.h>
 #endif
+#ifdef __EMX__
+#  include <X11/Xlibint.h>
+#endif
 
 #include "about_panel.h"
 
@@ -353,9 +356,18 @@ void show_help(const char *name) {
   
   if (!help_dialog) help_dialog = new Fl_Help_Dialog();
 
-  if ((docdir = getenv("FLTK_DOCDIR")) == NULL)
-    docdir = FLTK_DOCDIR;
+  if ((docdir = getenv("FLTK_DOCDIR")) == NULL) {
+#ifdef __EMX__
+    // Doesn't make sense to have a hardcoded fallback
+    static char fltk_docdir[1024];
 
+    strcpy(fltk_docdir, __XOS2RedirRoot("/XFree86/lib/X11/fltk/doc"));
+
+    docdir = fltk_docdir;
+#else
+    docdir = FLTK_DOCDIR;
+#endif // __EMX__
+  }
   snprintf(filename, sizeof(filename), "%s/%s", docdir, name);  
 
   help_dialog->load(filename);
@@ -521,5 +533,5 @@ int main(int argc,char **argv) {
 }
 
 //
-// End of "$Id: fluid.cxx,v 1.15.2.13.2.9 2001/10/29 21:59:14 easysw Exp $".
+// End of "$Id: fluid.cxx,v 1.15.2.13.2.10 2001/12/21 18:16:50 easysw Exp $".
 //
diff --git a/makefiles/makeinclude.os2x b/makefiles/makeinclude.os2x
index 126e37238..1ef60c81d 100644
--- a/makefiles/makeinclude.os2x
+++ b/makefiles/makeinclude.os2x
@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.os2x,v 1.1.2.4.2.3 2001/12/21 14:17:00 easysw Exp $"
+# "$Id: makeinclude.os2x,v 1.1.2.4.2.4 2001/12/21 18:16:50 easysw Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 # Generated automatically from makeinclude.in by configure.
@@ -34,9 +34,9 @@ mandir		=${prefix}/man
 srcdir		=.
 
 # programs we use...
-HTMLDOC		=e:/XFree86/bin/htmldoc.exe
-NROFF		=e:/usr/local/bin/nroff
-RM		=del
+HTMLDOC		=htmldoc
+NROFF		=nroff
+RM		=rm
 
 # compiler names:
 CXX		=gcc.exe
@@ -99,5 +99,5 @@ CAT3EXT		=3
 	mv t.z $@
 
 #
-# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.3 2001/12/21 14:17:00 easysw Exp $".
+# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.4 2001/12/21 18:16:50 easysw Exp $".
 #