diff --git a/srcpkgs/wine-unstable/patches/gentoo-wine-1.5.11-osmesa-check.patch b/srcpkgs/wine-unstable/patches/gentoo-wine-1.5.11-osmesa-check.patch
new file mode 100644
index 00000000000..e255b4f6017
--- /dev/null
+++ b/srcpkgs/wine-unstable/patches/gentoo-wine-1.5.11-osmesa-check.patch
@@ -0,0 +1,38 @@
+From 22fcf835dfe713ad93f649a901973208e0f7b62d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 7 Aug 2012 01:29:01 -0400
+Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
+
+If mesa had been built with shared glapi, glAccum is not available in
+libOSMesa without explicitly linking to libGL. In addition, in
+mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
+libglapi if mesa was built with shared glapi, see
+https://bugs.gentoo.org/show_bug.cgi?id=399813
+And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and
+libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832
+---
+ configure.ac |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git configure.ac configure.ac
+index 15ada86..6eab75e 100644
+--- configure.ac
++++ configure.ac
+@@ -1133,7 +1133,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
+ 
+                  if test "$ac_cv_header_GL_osmesa_h" = "yes"
+                  then
+-                    WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++                    WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++                    if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
++                       osmesa_save_CC=$CC
++                       CC=$CXX
++                       WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++                       CC=$osmesa_save_CC
++                    fi
+                  fi
+                  WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
+                                  [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
+-- 
+1.7.8.6
+
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index 135ac96c743..1a5b7b710d5 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -1,20 +1,29 @@
 # Template file for 'wine-unstable'
 __pkgname=wine
 pkgname=${__pkgname}-unstable
-version=1.5.8
+version=1.5.11
 wrksrc=${__pkgname}-${version}
 build_style=gnu-configure
 configure_args="--with-x"
 homepage="http://www.winehq.org/"
 distfiles="${SOURCEFORGE_SITE}/${__pkgname}/${__pkgname}-${version}.tar.bz2"
 depends="libwine-unstable"
-makedepends="flex gettext-devel lcms-devel zlib-devel ncurses-devel MesaLib-devel libSM-devel libXext-devel libX11-devel libXpm-devel libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel libXcursor-devel libXrandr-devel libXdamage-devel libXi-devel libldap-devel alsa-lib-devel libgphoto2-devel libxml2-devel libxslt-devel glib-devel gst-plugins-base-devel freetype-devel mpg123-devel libgsm-devel libopenal-devel giflib-devel libpng-devel v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel cups-devel sane-devel prelink"
-fulldepends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig"
+makedepends="flex gettext-devel autoconf lcms-devel zlib-devel ncurses-devel
+MesaLib-devel>=8.0.4_3 libSM-devel libXext-devel libX11-devel libXpm-devel
+libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
+libXcursor-devel libXrandr-devel libXdamage-devel libXi-devel libldap-devel
+alsa-lib-devel libgphoto2-devel libxml2-devel libxslt-devel glib-devel
+gst-plugins-base-devel freetype-devel mpg123-devel libgsm-devel libopenal-devel
+giflib-devel libpng-devel v4l-utils-devel fontconfig-devel gnutls-devel
+dbus-devel cups-devel sane-devel prelink"
+fulldepends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
+fontconfig libOSMesa"
+# libOSMesa is loaded with dlopen(3) at runtime
 revision=1
-short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)"
+short_desc="Run Windows apps on Linux, BSD, Solaris and Mac OS X. (unstable)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
-checksum=dff2bb0026dc155c0c8ae4fd4f87d4a9cd40496286af6ed05130c87d514fc543
+checksum=2854c853546ded26e9c15ba43c29ceace72b7815f25dfd048dd69dc321521488
 long_desc="
  Wine lets you run Windows software on other operating systems. With Wine,
  you can install and run these applications just like you would in
@@ -34,5 +43,6 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 pre_configure()
 {
+	autoreconf -fi
 	sed -i 's/\(libncurses\)/\1w/g' configure
 }