diff --git a/Make-config b/Make-config
index 90a3f9ff804..c03538894b9 100644
--- a/Make-config
+++ b/Make-config
@@ -945,15 +945,16 @@ sunos5-smp:
 	"GLW_LIB = libGLw.so" \
 	"OSMESA_LIB = libOSMesa.so" \
 	"CC = cc" \
-	"CPLUSPLUS = CC" \
-	"CFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xparallel -xdepend -xsafe=mem -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM" \
-	"CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xparallel -xdepend -xsafe=mem -I/usr/openwin/include -I/usr/dt/include" \
+	"CXX = c++" \
+	"CFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+	"CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include" \
 	"GLUT_CFLAGS = -DSOLARIS_2_4_BUG" \
-	"MAKELIB = ../bin/mklib.sunos5" \
+	"GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" \
 	"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
 	"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \
 	"GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
-	"APP_LIB_DEPS = -xparallel -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lCrun"
+	"MAKELIB = ../bin/mklib.solaris" \
+	"APP_LIB_DEPS = -lX11 -lglut -lGLU -lGL -lm -lCrun"
 
 sunos5-gcc:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -973,6 +974,24 @@ sunos5-gcc:
 	"GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
 	"APP_LIB_DEPS = -lX11 -lglut -lGLU -lGL -lm"
 
+sunos5-smp:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.so" \
+	"GLU_LIB = libGLU.so" \
+	"GLUT_LIB = libglut.so" \
+	"GLW_LIB = libGLw.so" \
+	"OSMESA_LIB = libOSMesa.so" \
+	"CC = cc" \
+	"CXX = CC" \
+	"CFLAGS = -KPIC -Xa -native -fast -xO5 -xautopar -xreduction -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+	"CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xautopar -xreduction -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+	"GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" \
+	"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+	"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \
+	"GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
+	"MAKELIB = ../bin/mklib.solaris" \
+	"APP_LIB_DEPS = -xautopar -xreduction -lX11 -lglut -lGLU -lGL -lm -lCrun -lthread"
+
 ultrix-gcc:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
 	"GL_LIB = libGL.a" \
diff --git a/Makefile.X11 b/Makefile.X11
index 0ee8325b9e8..f7e6d6c2c8b 100644
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.83 2003/09/03 20:48:05 brianp Exp $
+# $Id: Makefile.X11,v 1.84 2003/09/08 14:58:05 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.1
@@ -91,6 +91,7 @@ default:
 	@echo "  make sunos5               for Suns with SunOS 5.x"
 	@echo "  make sunos5-smp           for Suns with SunOS 5.x, SMP optimization"
 	@echo "  make sunos5-gcc           for Suns with SunOS 5.x and GCC"
+	@echo "  make sunos5-smp           for Suns with SunOS 5.x, for smp only"
 	@echo "  make ultrix-gcc           for DEC systems with Ultrix and GCC"
 	@echo "  make unixware             for PCs running UnixWare"
 	@echo "  make unixware-shared      for PCs running UnixWare, shared libs"