diff --git a/mozilla/base/src/Makefile b/mozilla/base/src/Makefile
index 6377fc76d4c..a1787cdb3c6 100644
--- a/mozilla/base/src/Makefile
+++ b/mozilla/base/src/Makefile
@@ -22,7 +22,11 @@ DEFINES =-D_IMPL_NS_BASE
 ifeq ($(OS_TARGET),Rhapsody)
 DIRS = rhapsody
 else
-DIRS = unix
+ifeq ($(USE_NGLAYOUT_GTK),1)
+DIRS = gtk
+else
+DIRS = motif
+endif
 endif
 
 LIBRARY_NAME = raptorbase
diff --git a/mozilla/base/src/Makefile.in b/mozilla/base/src/Makefile.in
index 5beaa5acf27..65e79e32d80 100644
--- a/mozilla/base/src/Makefile.in
+++ b/mozilla/base/src/Makefile.in
@@ -30,7 +30,7 @@ else
 ifeq ($(USE_NGLAYOUT_GTK),1)
 DIRS = gtk
 else
-DIRS = unix
+DIRS = motif
 endif
 endif
 
diff --git a/mozilla/base/src/unix/Makefile b/mozilla/base/src/motif/Makefile
similarity index 96%
rename from mozilla/base/src/unix/Makefile
rename to mozilla/base/src/motif/Makefile
index 91d9e79a866..b1d1fedd688 100644
--- a/mozilla/base/src/unix/Makefile
+++ b/mozilla/base/src/motif/Makefile
@@ -17,7 +17,7 @@
 
 DEPTH		= ../../..
 
-LIBRARY_NAME	= gmbaseunix
+LIBRARY_NAME	= gmbasemotif
 
 MODULE		= raptor
 
diff --git a/mozilla/base/src/unix/Makefile.in b/mozilla/base/src/motif/Makefile.in
similarity index 97%
rename from mozilla/base/src/unix/Makefile.in
rename to mozilla/base/src/motif/Makefile.in
index 1cf3e86b420..b0f035c391c 100644
--- a/mozilla/base/src/unix/Makefile.in
+++ b/mozilla/base/src/motif/Makefile.in
@@ -22,7 +22,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gmbaseunix
+LIBRARY_NAME	= gmbasemotif
 
 MODULE		= raptor
 
diff --git a/mozilla/base/src/unix/nsTimer.cpp b/mozilla/base/src/motif/nsTimer.cpp
similarity index 100%
rename from mozilla/base/src/unix/nsTimer.cpp
rename to mozilla/base/src/motif/nsTimer.cpp
diff --git a/mozilla/base/src/unix/README b/mozilla/base/src/unix/README
new file mode 100644
index 00000000000..3ad598b5eed
--- /dev/null
+++ b/mozilla/base/src/unix/README
@@ -0,0 +1,6 @@
+This directory is obsolote.
+
+The nsTimer files that used to live here have been moved to ../motif
+in order to allow for multiple unix toolkits.
+
+ramiro@netscape.com 11-02-1998