diff --git a/.cvsignore b/.cvsignore
index b6500b9..3a89b5e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wxPython-src-2.6.3.2.tar.gz
+wxPython-src-2.8.11.0.tar.bz2
diff --git a/sources b/sources
index ddd1250..08f0993 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04fc1079430b18e6fd097b3287e9ae10  wxPython-src-2.8.7.1.tar.bz2
+63f73aae49e530852db56a31b57529fa  wxPython-src-2.8.11.0.tar.bz2
diff --git a/wxPython-2.8.11.0-aui.patch b/wxPython-2.8.11.0-aui.patch
new file mode 100644
index 0000000..45fab7c
--- /dev/null
+++ b/wxPython-2.8.11.0-aui.patch
@@ -0,0 +1,24 @@
+diff -up wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py
+--- wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui	2010-05-27 15:38:42.000000000 +0200
++++ wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py	2010-05-27 15:38:50.000000000 +0200
+@@ -36,7 +36,7 @@ import ed_txt
+ import ed_mdlg
+ import ebmlib
+ import eclib
+-from extern import aui
++from wx.lib.agw import aui
+ 
+ #--------------------------------------------------------------------------#
+ # Globals
+diff -up wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py
+--- wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui	2010-05-27 15:38:20.000000000 +0200
++++ wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py	2010-05-27 15:38:28.000000000 +0200
+@@ -28,7 +28,7 @@ import ed_glob
+ from profiler import Profile_Get
+ import plugin
+ import iface
+-import extern.aui as aui
++from wx.lib.agw import aui
+ 
+ #--------------------------------------------------------------------------#
+ # Globals
diff --git a/wxPython-2.8.9.2-treelist.patch b/wxPython-2.8.9.2-treelist.patch
new file mode 100644
index 0000000..e7cf28b
--- /dev/null
+++ b/wxPython-2.8.9.2-treelist.patch
@@ -0,0 +1,11 @@
+--- wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp.orig	2009-04-10 23:03:18.000000000 +0200
++++ wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp	2009-04-10 23:03:41.000000000 +0200
+@@ -10321,7 +10321,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_
+   PyObject *resultobj = 0;
+   wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
+   wxTreeItemId *arg2 = 0 ;
+-  wxTreeItemId const &arg3_defvalue = NULL ;
++  wxTreeItemId const &arg3_defvalue = (wxTreeItemId *) NULL ;
+   wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ;
+   bool arg4 = (bool) true ;
+   void *argp1 = 0 ;
diff --git a/wxPython.spec b/wxPython.spec
index ab16667..7100fd7 100644
--- a/wxPython.spec
+++ b/wxPython.spec
@@ -4,8 +4,8 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.8.7.1
-Release:        2%{?dist}
+Version:        2.8.11.0
+Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
@@ -13,9 +13,14 @@ Group:          Development/Languages
 License:        LGPL
 URL:            http://www.wxpython.org/
 Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2
+# http://trac.wxwidgets.org/ticket/10703
+Patch0:         wxPython-2.8.9.2-treelist.patch
+# fix aui imports
+# http://trac.wxwidgets.org/ticket/12107
+Patch1:         wxPython-2.8.11.0-aui.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # make sure to keep this updated as appropriate
-BuildRequires:  wxGTK-devel >= 2.8.7
+BuildRequires:  wxGTK-devel >= 2.8.11
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  libGL-devel, libGLU-devel
@@ -49,6 +54,11 @@ programs which use the wxPython toolkit.
 
 %prep
 %setup -q -n wxPython-src-%{version}
+%patch0 -p1 -b .treelist
+%patch1 -p1 -b .aui
+
+# fix libdir otherwise additional wx libs cannot be found
+sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
 
 
 %build
@@ -84,7 +94,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{python_sitearch}/wx-2.8-gtk2-unicode/
 %{python_sitearch}/wx-2.8-gtk2-unicode/wx
 %{python_sitearch}/wx-2.8-gtk2-unicode/wxPython
-%{python_sitelib}/wxaddons
 %if 0%{?fedora} >= 9
 %{python_sitelib}/*egg-info
 %{python_sitearch}/wx-2.8-gtk2-unicode/*egg-info
@@ -101,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 31 2010 Dan Horák <dan[at]danny.cz> - 2.8.11.0-1
+- update to 2.8.11.0 (#593837, #595936, #597639)
+
 * Thu Feb 21 2008 Matthew Miller <mattdm@mattdm.org> - 2.8.7.1-2
 - include egg-info files for fedora 9 or greater