diff --git a/Makefile b/Makefile
index e5d5aca8fd5..39123d7cec9 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@ default: $(TOP)/configs/current
 	done
 
 
+doxygen:
+	(cd doxygen ; make) ; \
+
 clean:
 	@for dir in $(SUBDIRS) ; do \
 		(cd $$dir ; $(MAKE) clean) ; \
@@ -43,6 +46,7 @@ $(TOP)/configs/current:
 # Rules to set/install a specific build configuration
 aix \
 aix-gcc \
+aix-static \
 darwin \
 darwin-static \
 freebsd \
diff --git a/configs/aix b/configs/aix
index 0deccfd8be7..1335f409df3 100644
--- a/configs/aix
+++ b/configs/aix
@@ -1,4 +1,4 @@
-# Configuration for AIX
+# Configuration for AIX, dynamic libs
 
 include $(TOP)/configs/default
 
@@ -6,12 +6,11 @@ CONFIG_NAME = aix
 
 # Compiler and flags
 CC = cc
-# XXX fix this:
-CXX = c++
+CXX = xlC
 
 CFLAGS = -O -DAIXV3
 CXXFLAGS = -O -DAIXV3
-MKLIB_OPTIONS = -static
+MKLIB_OPTIONS =
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
@@ -20,5 +19,10 @@ GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 
-APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm
+GL_LIB_DEPS = -lX11 -lXext -lm
+GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm -lC
+GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lXi -lXmu -lX11 -lm
+GLW_LIB_DEPS = -L$(TOP)/lib -lGL -lXt -lX11
+OSMESA_LIB_DEPS = -L$(TOP)/lib -lGL
+APP_LIB_DEPS = -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm -lC
 
diff --git a/configs/aix-static b/configs/aix-static
new file mode 100644
index 00000000000..f6f086edb6a
--- /dev/null
+++ b/configs/aix-static
@@ -0,0 +1,23 @@
+# Configuration for AIX, static libs
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = aix-static
+
+# Compiler and flags
+CC = cc
+CXX = xlC
+
+CFLAGS = -O -DAIXV3
+CXXFLAGS = -O -DAIXV3
+MKLIB_OPTIONS = -static
+
+# Library names (actual file names)
+GL_LIB_NAME = libGL.a
+GLU_LIB_NAME = libGLU.a
+GLUT_LIB_NAME = libglut.a
+GLW_LIB_NAME = libGLw.a
+OSMESA_LIB_NAME = libOSMesa.a
+
+APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm
+