diff --git a/configs/linux-dri b/configs/linux-dri
index 936fce99829..494b0aab8e9 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -66,4 +66,4 @@ WINDOW_SYSTEM=dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = intel_winsys 
+DRI_DIRS = intel_winsys nouveau_winsys
diff --git a/src/mesa/drivers/dri/nouveau_winsys/Makefile b/src/mesa/drivers/dri/nouveau_winsys/Makefile
index 59ba561eb93..98ec5a79f5d 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/Makefile
+++ b/src/mesa/drivers/dri/nouveau_winsys/Makefile
@@ -8,7 +8,7 @@ MINIGLX_SOURCES =
 
 PIPE_DRIVERS = \
 	$(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a \
-	$(TOP)/src/mesa/pipe/nv40/libnv30.a \
+	$(TOP)/src/mesa/pipe/nv30/libnv30.a \
 	$(TOP)/src/mesa/pipe/nv40/libnv40.a \
 	$(TOP)/src/mesa/pipe/nv50/libnv50.a