diff --git a/motif/server/Config.hpux_cc b/motif/server/Config.hpux_cc
new file mode 100644
index 0000000000000000000000000000000000000000..abac39f2c8a37339e13be907e48e394e342e6195
--- /dev/null
+++ b/motif/server/Config.hpux_cc
@@ -0,0 +1,6 @@
+CC = cc -Ae
+
+CFLAGS = -O -I/usr/include/X11R5 -I/usr/include/Motif1.2
+
+# -Wl,-a,archive forces motif libraries to be included (not shared.)
+LDFLAGS = -L/usr/lib/X11R5 -L/usr/lib/Motif1.2
diff --git a/motif/server/Config.pmax_mach b/motif/server/Config.pmax_mach
new file mode 100644
index 0000000000000000000000000000000000000000..614218b48b648c02f4bfe5d8aa95e44893bf6fb0
--- /dev/null
+++ b/motif/server/Config.pmax_mach
@@ -0,0 +1,2 @@
+CFLAGS = -O -G 0 -I/usr/misc/.motif/include -I/usr/misc/.X11/include
+LDFLAGS = -G 0 -L/usr/misc/.X11/lib -L/usr/misc/.motif/lib
diff --git a/motif/server/Config.solaris b/motif/server/Config.solaris
new file mode 100644
index 0000000000000000000000000000000000000000..365119bcb4b6da2576d820618cff06105f4632f1
--- /dev/null
+++ b/motif/server/Config.solaris
@@ -0,0 +1,4 @@
+# -DSVR4 is needed for X and for Solaris.
+CFLAGS = -O -DSVR4 -I/usr/openwin/include
+LDFLAGS = -L/usr/openwin/lib -R/usr/openwin/lib
+LIBS = -lXm -lXt -lX11 -lsocket -lnsl -lgen
diff --git a/motif/server/GNUmakefile b/motif/server/GNUmakefile
index 260bf3d5f870b2c2cb4bd4a61add7148ab981ed0..3793e36121a1986b7c01fe736026eb57285b80c3 100644
--- a/motif/server/GNUmakefile
+++ b/motif/server/GNUmakefile
@@ -1,30 +1,17 @@
-CC = cc
-#CC = gcc
-
-#
-# Places to look for X and Motif headers
-XHDR  = -I/usr/misc/.X11/include
-XMHDR = -I/usr/misc/.motif/include
-
-#
-# Places to look for X and Motif libraries
-XLIB  = -L/usr/misc/.X11/lib
-XMLIB = -L/usr/misc/.motif/lib
-
-#
-# -G 0 option is for MIPS only
-CFLAGS = -O -G 0 $(XHDR) $(XMHDR)
-LDFLAGS = -G 0 $(XLIB) $(XMLIB)
+CC = gcc
 LIBS = -lXm -lXt -lX11
+CFLAGS = -O
+LDFLAGS =
+
+TARGET = motifd
 OBJS = main.o server.o translations.o packet.o message.o datatrans.o \
        requests.o callbacks.o widgets.o resources.o tables.o motif.o \
-       text.o xmstring.o list.o events.o
-TARGET = motifd
+       text.o xmstring.o list.o events.o timer-support.o
 
+include Config
 
 $(TARGET) : $(OBJS)
 	$(CC) -o $(TARGET) $(LDFLAGS) $(OBJS) $(LIBS)
-	strip $(TARGET)
 
 tables.o : tables.c StringTable.h ClassTable.h TypeTable.h
 	$(CC) $(CFLAGS) -c tables.c