diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index 25a07c166758..4e914f0b4f79 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	py-wxPython
-PORTVERSION=	2.1.16
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://alldunn.com/wxPython/dist/
 DISTNAME=	wxPython-${PORTVERSION}
diff --git a/x11-toolkits/py-wxPython/distinfo b/x11-toolkits/py-wxPython/distinfo
index 0d44a0de1e8b..b2488a34e21f 100644
--- a/x11-toolkits/py-wxPython/distinfo
+++ b/x11-toolkits/py-wxPython/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.1.16.tar.gz) = 1726900104f1af14aa60ee3c0ae9b1d3
+MD5 (wxPython-2.2.1.tar.gz) = 48b39076d362e568b0c7cd49f613b2ee
diff --git a/x11-toolkits/py-wxPython/pkg-plist b/x11-toolkits/py-wxPython/pkg-plist
index 993db114db04..718f1b512381 100644
--- a/x11-toolkits/py-wxPython/pkg-plist
+++ b/x11-toolkits/py-wxPython/pkg-plist
@@ -84,6 +84,9 @@ lib/python1.5/site-packages/wxPython/demo/PrintFramework.pyo
 lib/python1.5/site-packages/wxPython/demo/PyShell.py
 lib/python1.5/site-packages/wxPython/demo/PyShell.pyc
 lib/python1.5/site-packages/wxPython/demo/PyShell.pyo
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.py
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.pyc
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.pyo
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.py
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.pyc
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.pyo
@@ -135,6 +138,7 @@ lib/python1.5/site-packages/wxPython/demo/data/imagemap.htm
 lib/python1.5/site-packages/wxPython/demo/data/imagemap.png
 lib/python1.5/site-packages/wxPython/demo/data/pic.png
 lib/python1.5/site-packages/wxPython/demo/data/pic2.bmp
+lib/python1.5/site-packages/wxPython/demo/data/showTips
 lib/python1.5/site-packages/wxPython/demo/data/stc.h
 lib/python1.5/site-packages/wxPython/demo/data/tables.htm
 lib/python1.5/site-packages/wxPython/demo/data/test.htm
@@ -404,6 +408,9 @@ lib/python1.5/site-packages/wxPython/lib/layoutf.pyo
 lib/python1.5/site-packages/wxPython/lib/mvctree.py
 lib/python1.5/site-packages/wxPython/lib/mvctree.pyc
 lib/python1.5/site-packages/wxPython/lib/mvctree.pyo
+lib/python1.5/site-packages/wxPython/lib/pyshell.py
+lib/python1.5/site-packages/wxPython/lib/pyshell.pyc
+lib/python1.5/site-packages/wxPython/lib/pyshell.pyo
 lib/python1.5/site-packages/wxPython/lib/shell.py
 lib/python1.5/site-packages/wxPython/lib/shell.pyc
 lib/python1.5/site-packages/wxPython/lib/shell.pyo
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 25a07c166758..4e914f0b4f79 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	py-wxPython
-PORTVERSION=	2.1.16
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://alldunn.com/wxPython/dist/
 DISTNAME=	wxPython-${PORTVERSION}
diff --git a/x11-toolkits/py-wxPython24/distinfo b/x11-toolkits/py-wxPython24/distinfo
index 0d44a0de1e8b..b2488a34e21f 100644
--- a/x11-toolkits/py-wxPython24/distinfo
+++ b/x11-toolkits/py-wxPython24/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.1.16.tar.gz) = 1726900104f1af14aa60ee3c0ae9b1d3
+MD5 (wxPython-2.2.1.tar.gz) = 48b39076d362e568b0c7cd49f613b2ee
diff --git a/x11-toolkits/py-wxPython24/pkg-plist b/x11-toolkits/py-wxPython24/pkg-plist
index 993db114db04..718f1b512381 100644
--- a/x11-toolkits/py-wxPython24/pkg-plist
+++ b/x11-toolkits/py-wxPython24/pkg-plist
@@ -84,6 +84,9 @@ lib/python1.5/site-packages/wxPython/demo/PrintFramework.pyo
 lib/python1.5/site-packages/wxPython/demo/PyShell.py
 lib/python1.5/site-packages/wxPython/demo/PyShell.pyc
 lib/python1.5/site-packages/wxPython/demo/PyShell.pyo
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.py
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.pyc
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.pyo
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.py
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.pyc
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.pyo
@@ -135,6 +138,7 @@ lib/python1.5/site-packages/wxPython/demo/data/imagemap.htm
 lib/python1.5/site-packages/wxPython/demo/data/imagemap.png
 lib/python1.5/site-packages/wxPython/demo/data/pic.png
 lib/python1.5/site-packages/wxPython/demo/data/pic2.bmp
+lib/python1.5/site-packages/wxPython/demo/data/showTips
 lib/python1.5/site-packages/wxPython/demo/data/stc.h
 lib/python1.5/site-packages/wxPython/demo/data/tables.htm
 lib/python1.5/site-packages/wxPython/demo/data/test.htm
@@ -404,6 +408,9 @@ lib/python1.5/site-packages/wxPython/lib/layoutf.pyo
 lib/python1.5/site-packages/wxPython/lib/mvctree.py
 lib/python1.5/site-packages/wxPython/lib/mvctree.pyc
 lib/python1.5/site-packages/wxPython/lib/mvctree.pyo
+lib/python1.5/site-packages/wxPython/lib/pyshell.py
+lib/python1.5/site-packages/wxPython/lib/pyshell.pyc
+lib/python1.5/site-packages/wxPython/lib/pyshell.pyo
 lib/python1.5/site-packages/wxPython/lib/shell.py
 lib/python1.5/site-packages/wxPython/lib/shell.pyc
 lib/python1.5/site-packages/wxPython/lib/shell.pyo
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 25a07c166758..4e914f0b4f79 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	py-wxPython
-PORTVERSION=	2.1.16
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://alldunn.com/wxPython/dist/
 DISTNAME=	wxPython-${PORTVERSION}
diff --git a/x11-toolkits/py-wxPython26/distinfo b/x11-toolkits/py-wxPython26/distinfo
index 0d44a0de1e8b..b2488a34e21f 100644
--- a/x11-toolkits/py-wxPython26/distinfo
+++ b/x11-toolkits/py-wxPython26/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.1.16.tar.gz) = 1726900104f1af14aa60ee3c0ae9b1d3
+MD5 (wxPython-2.2.1.tar.gz) = 48b39076d362e568b0c7cd49f613b2ee
diff --git a/x11-toolkits/py-wxPython26/pkg-plist b/x11-toolkits/py-wxPython26/pkg-plist
index 993db114db04..718f1b512381 100644
--- a/x11-toolkits/py-wxPython26/pkg-plist
+++ b/x11-toolkits/py-wxPython26/pkg-plist
@@ -84,6 +84,9 @@ lib/python1.5/site-packages/wxPython/demo/PrintFramework.pyo
 lib/python1.5/site-packages/wxPython/demo/PyShell.py
 lib/python1.5/site-packages/wxPython/demo/PyShell.pyc
 lib/python1.5/site-packages/wxPython/demo/PyShell.pyo
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.py
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.pyc
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.pyo
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.py
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.pyc
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.pyo
@@ -135,6 +138,7 @@ lib/python1.5/site-packages/wxPython/demo/data/imagemap.htm
 lib/python1.5/site-packages/wxPython/demo/data/imagemap.png
 lib/python1.5/site-packages/wxPython/demo/data/pic.png
 lib/python1.5/site-packages/wxPython/demo/data/pic2.bmp
+lib/python1.5/site-packages/wxPython/demo/data/showTips
 lib/python1.5/site-packages/wxPython/demo/data/stc.h
 lib/python1.5/site-packages/wxPython/demo/data/tables.htm
 lib/python1.5/site-packages/wxPython/demo/data/test.htm
@@ -404,6 +408,9 @@ lib/python1.5/site-packages/wxPython/lib/layoutf.pyo
 lib/python1.5/site-packages/wxPython/lib/mvctree.py
 lib/python1.5/site-packages/wxPython/lib/mvctree.pyc
 lib/python1.5/site-packages/wxPython/lib/mvctree.pyo
+lib/python1.5/site-packages/wxPython/lib/pyshell.py
+lib/python1.5/site-packages/wxPython/lib/pyshell.pyc
+lib/python1.5/site-packages/wxPython/lib/pyshell.pyo
 lib/python1.5/site-packages/wxPython/lib/shell.py
 lib/python1.5/site-packages/wxPython/lib/shell.pyc
 lib/python1.5/site-packages/wxPython/lib/shell.pyo
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 25a07c166758..4e914f0b4f79 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	py-wxPython
-PORTVERSION=	2.1.16
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://alldunn.com/wxPython/dist/
 DISTNAME=	wxPython-${PORTVERSION}
diff --git a/x11-toolkits/py-wxPython28/distinfo b/x11-toolkits/py-wxPython28/distinfo
index 0d44a0de1e8b..b2488a34e21f 100644
--- a/x11-toolkits/py-wxPython28/distinfo
+++ b/x11-toolkits/py-wxPython28/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.1.16.tar.gz) = 1726900104f1af14aa60ee3c0ae9b1d3
+MD5 (wxPython-2.2.1.tar.gz) = 48b39076d362e568b0c7cd49f613b2ee
diff --git a/x11-toolkits/py-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist
index 993db114db04..718f1b512381 100644
--- a/x11-toolkits/py-wxPython28/pkg-plist
+++ b/x11-toolkits/py-wxPython28/pkg-plist
@@ -84,6 +84,9 @@ lib/python1.5/site-packages/wxPython/demo/PrintFramework.pyo
 lib/python1.5/site-packages/wxPython/demo/PyShell.py
 lib/python1.5/site-packages/wxPython/demo/PyShell.pyc
 lib/python1.5/site-packages/wxPython/demo/PyShell.pyo
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.py
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.pyc
+lib/python1.5/site-packages/wxPython/demo/PyShellWindow.pyo
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.py
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.pyc
 lib/python1.5/site-packages/wxPython/demo/PythonEvents.pyo
@@ -135,6 +138,7 @@ lib/python1.5/site-packages/wxPython/demo/data/imagemap.htm
 lib/python1.5/site-packages/wxPython/demo/data/imagemap.png
 lib/python1.5/site-packages/wxPython/demo/data/pic.png
 lib/python1.5/site-packages/wxPython/demo/data/pic2.bmp
+lib/python1.5/site-packages/wxPython/demo/data/showTips
 lib/python1.5/site-packages/wxPython/demo/data/stc.h
 lib/python1.5/site-packages/wxPython/demo/data/tables.htm
 lib/python1.5/site-packages/wxPython/demo/data/test.htm
@@ -404,6 +408,9 @@ lib/python1.5/site-packages/wxPython/lib/layoutf.pyo
 lib/python1.5/site-packages/wxPython/lib/mvctree.py
 lib/python1.5/site-packages/wxPython/lib/mvctree.pyc
 lib/python1.5/site-packages/wxPython/lib/mvctree.pyo
+lib/python1.5/site-packages/wxPython/lib/pyshell.py
+lib/python1.5/site-packages/wxPython/lib/pyshell.pyc
+lib/python1.5/site-packages/wxPython/lib/pyshell.pyo
 lib/python1.5/site-packages/wxPython/lib/shell.py
 lib/python1.5/site-packages/wxPython/lib/shell.pyc
 lib/python1.5/site-packages/wxPython/lib/shell.pyo