diff --git a/Mesa.changes b/Mesa.changes
index 6b6824c..6516579 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug  2 13:05:58 UTC 2011 - mhopf@novell.com
+
+- Obsolete Mesa-nouveau3d (included in standard Mesa package now)
+- Also nuke from baselibs.conf
+
 -------------------------------------------------------------------
 Fri Jul 29 10:10:31 UTC 2011 - mhopf@novell.com
 
diff --git a/Mesa.spec b/Mesa.spec
index d9e07cd..404cbe3 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -30,6 +30,7 @@ License:        MIT License (or similar)
 Group:          System/Libraries
 Provides:       xorg-x11-Mesa = %{version} intel-i810-Mesa = %{version} Mesa7 = %{version}
 Obsoletes:      xorg-x11-Mesa < %{version} intel-i810-Mesa < %{version} Mesa7 < %{version}
+Obsoletes:	Mesa-nouveau3d
 AutoReqProv:    on
 # bug437293
 %ifarch ppc64
@@ -106,30 +107,6 @@ Authors:
 --------
     Brian Paul
 
-%ifarch %ix86 x86_64 ppc %sparc hppa
-%if 0%{?suse_version} >= 1130
-%package nouveau3d
-License:        MIT License (or similar)
-Requires:       Mesa = %version xorg-x11-driver-video-nouveau
-Summary:        Experimental 3D driver for nouveau driver
-Group:          System/Libraries
-
-%description nouveau3d
-This is the 3D driver for open source nouveau driver. It uses Gallium3d architecture within Mesa.
-
-Note:
-This driver is in a very experimental state. So it is not recommend that you use it.
-Bug reports using this driver are not supported by developers.
-
-Authors:
---------
-    Brian Paul
-    Pekka Paalanen
-    Ben Skeggs
-    Francisco Jerez
-%endif
-%endif
-
 %prep
 %setup -n %{name}-%{_version} -b4 -q
 # no need to build (GLUT-)Demos
@@ -221,9 +198,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so.*
 %{_libdir}/dri/
 #%{_libdir}/egl/
-%if 0%{?suse_version} >= 1130
-%exclude %{_libdir}/dri/nouveau_dri.so
-%endif
 
 %files devel
 %defattr(-,root,root)
@@ -248,12 +222,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/glesv2.pc
 %{_mandir}/man3/*
 
-%ifarch %ix86 x86_64 ppc %sparc hppa
-%if 0%{?suse_version} >= 1130
-%files nouveau3d
-%defattr(-,root,root)
-%{_libdir}/dri/nouveau_dri.so
-%endif
-%endif
-
 %changelog
diff --git a/baselibs.conf b/baselibs.conf
index b0f5fa7..5369715 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -5,4 +5,3 @@ Mesa
 Mesa-devel
   obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
   provides  "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
-Mesa-nouveau3d