diff --git a/lang/python/2.6/Makefile b/lang/python/2.6/Makefile
index 1eec8776375..4bd7fdf3b07 100644
--- a/lang/python/2.6/Makefile
+++ b/lang/python/2.6/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2009/08/10 17:31:07 kili Exp $
+# $OpenBSD: Makefile,v 1.8 2009/10/16 09:38:20 djm Exp $
 
 VERSION=		2.6
-PATCHLEVEL=		.2
-PKG_PATCHLEVEL=		p1
+PATCHLEVEL=		.3
+#PKG_PATCHLEVEL=		p1
 SHARED_LIBS=		python2.6 1.0
 
 # PSUBDIR=		python/${VERSION}
diff --git a/lang/python/2.6/distinfo b/lang/python/2.6/distinfo
index 4939c7875d3..e2a2f63d0c1 100644
--- a/lang/python/2.6/distinfo
+++ b/lang/python/2.6/distinfo
@@ -1,5 +1,5 @@
-MD5 (Python-2.6.2.tgz) = YOZP5V604jq91Nd/2tCMPQ==
-RMD160 (Python-2.6.2.tgz) = a2KkgbRtzuJo2otNhHyHxIGqJB8=
-SHA1 (Python-2.6.2.tgz) = 2suMREE4k/xXVdkdsmBCI0ZYyOA=
-SHA256 (Python-2.6.2.tgz) = 437N8knySPT+oietvKCcd4Zwtk/LXkWUfsPgk8vBLIY=
-SIZE (Python-2.6.2.tgz) = 13281177
+MD5 (Python-2.6.3.tgz) = xIQlMhcPwKb56HhJfvwN3w==
+RMD160 (Python-2.6.3.tgz) = MA2Hj9fwI5MYjrMIsgyReTgHPUA=
+SHA1 (Python-2.6.3.tgz) = QaUefPXpit3OG2xOSpnqEoUxHfg=
+SHA256 (Python-2.6.3.tgz) = pxtVVAaQQl/YKrAIGa65LBsjy7RzCgzNLiXIM7IqgS4=
+SIZE (Python-2.6.3.tgz) = 13319447
diff --git a/lang/python/2.6/patches/patch-Lib_distutils_command_build_ext_py b/lang/python/2.6/patches/patch-Lib_distutils_command_build_ext_py
index fc414f58933..477955bf960 100644
--- a/lang/python/2.6/patches/patch-Lib_distutils_command_build_ext_py
+++ b/lang/python/2.6/patches/patch-Lib_distutils_command_build_ext_py
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Lib_distutils_command_build_ext_py,v 1.2 2009/05/03 22:26:27 djm Exp $
---- Lib/distutils/command/build_ext.py.orig	Fri Feb  6 09:55:00 2009
-+++ Lib/distutils/command/build_ext.py	Sun Apr 19 10:28:50 2009
-@@ -760,13 +760,6 @@ class build_ext (Command):
+$OpenBSD: patch-Lib_distutils_command_build_ext_py,v 1.3 2009/10/16 09:38:20 djm Exp $
+--- Lib/distutils/command/build_ext.py.orig	Wed Sep  9 21:39:41 2009
++++ Lib/distutils/command/build_ext.py	Mon Oct  5 07:12:37 2009
+@@ -750,13 +750,6 @@ class build_ext (Command):
              return ext.libraries
  
          else:
diff --git a/lang/python/2.6/patches/patch-Lib_test_test_fileio_py b/lang/python/2.6/patches/patch-Lib_test_test_fileio_py
deleted file mode 100644
index 0062285f176..00000000000
--- a/lang/python/2.6/patches/patch-Lib_test_test_fileio_py
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-Lib_test_test_fileio_py,v 1.2 2009/05/03 22:26:27 djm Exp $
---- Lib/test/test_fileio.py.orig	Tue Jan 20 08:02:45 2009
-+++ Lib/test/test_fileio.py	Sun Apr 19 10:28:51 2009
-@@ -152,6 +152,7 @@ class OtherFileTests(unittest.TestCase):
-                     self.assertEquals(f.writable(), True)
-                     if sys.platform != "darwin" and \
-                        not sys.platform.startswith('freebsd') and \
-+                       not sys.platform.startswith('openbsd') and \
-                        not sys.platform.startswith('sunos'):
-                         # Somehow /dev/tty appears seekable on some BSDs
-                         self.assertEquals(f.seekable(), False)
diff --git a/lang/python/2.6/patches/patch-Modules_nismodule_c b/lang/python/2.6/patches/patch-Modules_nismodule_c
deleted file mode 100644
index b80082cdafe..00000000000
--- a/lang/python/2.6/patches/patch-Modules_nismodule_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Modules_nismodule_c,v 1.1 2008/10/18 12:03:56 djm Exp $
---- Modules/nismodule.c.orig	Tue Feb 28 03:46:16 2006
-+++ Modules/nismodule.c	Mon Sep 18 06:31:10 2006
-@@ -89,7 +89,7 @@ nis_mapname (char *map, int *pfix)
- 	return map;
- }
- 
--#ifdef __APPLE__
-+#ifdef __OpenBSD__
- typedef int (*foreachfunc)(unsigned long, char *, int, char *, int, void *);
- #else
- typedef int (*foreachfunc)(int, char *, int, char *, int, char *);
diff --git a/lang/python/2.6/patches/patch-configure_in b/lang/python/2.6/patches/patch-configure_in
index ca67791090b..7845632848e 100644
--- a/lang/python/2.6/patches/patch-configure_in
+++ b/lang/python/2.6/patches/patch-configure_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.2 2009/05/03 22:26:27 djm Exp $
---- configure.in.orig	Tue Mar 31 03:56:14 2009
-+++ configure.in	Sun Apr 19 10:28:55 2009
-@@ -253,7 +253,7 @@ case $ac_sys_system/$ac_sys_release in
+$OpenBSD: patch-configure_in,v 1.3 2009/10/16 09:38:20 djm Exp $
+--- configure.in.orig	Tue Sep 29 23:01:59 2009
++++ configure.in	Mon Oct  5 07:12:38 2009
+@@ -262,7 +262,7 @@ case $ac_sys_system/$ac_sys_release in
    # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
    # even though select is a POSIX function. Reported by J. Ribbens.
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.2 2009/05/03 22:26:27 djm Exp $
      define_xopen_source=no
      # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
      # also defined. This can be overridden by defining _BSD_SOURCE
-@@ -1683,27 +1683,13 @@ then
+@@ -1768,27 +1768,13 @@ then
  		;;
  	Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
  	BSD/OS*/4*) LDSHARED="gcc -shared";;
@@ -39,7 +39,7 @@ $OpenBSD: patch-configure_in,v 1.2 2009/05/03 22:26:27 djm Exp $
  	NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
-@@ -1855,9 +1841,10 @@ AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-U
+@@ -1940,9 +1926,10 @@ AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-U
  
  # only check for sem_init if thread support is requested
  if test "$with_threads" = "yes" -o -z "$with_threads"; then
diff --git a/lang/python/2.6/patches/patch-setup_py b/lang/python/2.6/patches/patch-setup_py
index be0d5356165..c87c26f78b5 100644
--- a/lang/python/2.6/patches/patch-setup_py
+++ b/lang/python/2.6/patches/patch-setup_py
@@ -1,6 +1,6 @@
-$OpenBSD: patch-setup_py,v 1.3 2009/05/03 22:26:27 djm Exp $
---- setup.py.orig	Wed Apr  1 04:20:48 2009
-+++ setup.py	Sun Apr 19 10:28:55 2009
+$OpenBSD: patch-setup_py,v 1.4 2009/10/16 09:38:20 djm Exp $
+--- setup.py.orig	Sun Sep 20 20:37:33 2009
++++ setup.py	Mon Oct  5 07:12:38 2009
 @@ -19,6 +19,11 @@ from distutils.command.install_lib import install_lib
  # This global variable is used to hold the list of modules to be disabled.
  disabled_module_list = []
@@ -139,7 +139,7 @@ $OpenBSD: patch-setup_py,v 1.3 2009/05/03 22:26:27 djm Exp $
          else:
              missing.append('ossaudiodev')
  
-@@ -1494,7 +1509,7 @@ class PyBuildExt(build_ext):
+@@ -1505,7 +1520,7 @@ class PyBuildExt(build_ext):
          # For 8.4a2, the X11 headers are not included. Rather than include a
          # complicated search, this is a hard-coded path. It could bail out
          # if X11 libs are not found...
@@ -148,7 +148,7 @@ $OpenBSD: patch-setup_py,v 1.3 2009/05/03 22:26:27 djm Exp $
          frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
  
          # All existing framework builds of Tcl/Tk don't support 64-bit
-@@ -1541,8 +1556,7 @@ class PyBuildExt(build_ext):
+@@ -1550,8 +1565,7 @@ class PyBuildExt(build_ext):
          # The versions with dots are used on Unix, and the versions without
          # dots on Windows, for detection by cygwin.
          tcllib = tklib = tcl_includes = tk_includes = None
@@ -158,7 +158,7 @@ $OpenBSD: patch-setup_py,v 1.3 2009/05/03 22:26:27 djm Exp $
              tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
              tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
              if tklib and tcllib:
-@@ -1583,17 +1597,9 @@ class PyBuildExt(build_ext):
+@@ -1592,17 +1606,9 @@ class PyBuildExt(build_ext):
          if platform == 'sunos5':
              include_dirs.append('/usr/openwin/include')
              added_lib_dirs.append('/usr/openwin/lib')
@@ -179,7 +179,7 @@ $OpenBSD: patch-setup_py,v 1.3 2009/05/03 22:26:27 djm Exp $
  
          # If Cygwin, then verify that X is installed before proceeding
          if platform == 'cygwin':
-@@ -1893,7 +1899,7 @@ def main():
+@@ -1902,7 +1908,7 @@ def main():
            # Scripts to install
            scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
                       'Tools/scripts/2to3',
diff --git a/lang/python/2.6/pkg/PLIST-main b/lang/python/2.6/pkg/PLIST-main
index 464b86426d7..5274ca21329 100644
--- a/lang/python/2.6/pkg/PLIST-main
+++ b/lang/python/2.6/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2009/05/03 22:26:27 djm Exp $
+@comment $OpenBSD: PLIST-main,v 1.4 2009/10/16 09:38:20 djm Exp $
 @option no-default-conflict
 @conflict python->=2.6,<2.7
 @conflict python-bz2->=2.6,<2.7
@@ -1257,7 +1257,7 @@ lib/python2.6/keyword.py
 lib/python2.6/keyword.pyc
 lib/python2.6/keyword.pyo
 lib/python2.6/lib-dynload/
-lib/python2.6/lib-dynload/Python-2.6.2-py2.6.egg-info
+lib/python2.6/lib-dynload/Python-2.6.3-py2.6.egg-info
 lib/python2.6/lib-dynload/_bisect.so
 lib/python2.6/lib-dynload/_bytesio.so
 lib/python2.6/lib-dynload/_codecs_cn.so
@@ -1322,9 +1322,9 @@ lib/python2.6/lib-dynload/zlib.so
 lib/python2.6/lib-old/
 lib/python2.6/lib2to3/
 lib/python2.6/lib2to3/Grammar.txt
-lib/python2.6/lib2to3/Grammar2.6.2.final.0.pickle
+lib/python2.6/lib2to3/Grammar2.6.3.final.0.pickle
 lib/python2.6/lib2to3/PatternGrammar.txt
-lib/python2.6/lib2to3/PatternGrammar2.6.2.final.0.pickle
+lib/python2.6/lib2to3/PatternGrammar2.6.3.final.0.pickle
 lib/python2.6/lib2to3/__init__.py
 lib/python2.6/lib2to3/__init__.pyc
 lib/python2.6/lib2to3/__init__.pyo
diff --git a/lang/python/2.6/pkg/PLIST-tests b/lang/python/2.6/pkg/PLIST-tests
index 770768f94c4..d440f8ffed0 100644
--- a/lang/python/2.6/pkg/PLIST-tests
+++ b/lang/python/2.6/pkg/PLIST-tests
@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST-tests,v 1.3 2009/05/03 22:26:27 djm Exp $
+@comment $OpenBSD: PLIST-tests,v 1.4 2009/10/16 09:38:20 djm Exp $
 @option no-default-conflict
 @conflict python-tests->=2.6,<2.6
 lib/python2.6/test/
 lib/python2.6/test/185test.db
 lib/python2.6/test/README
+lib/python2.6/test/Sine-1000Hz-300ms.aif
 lib/python2.6/test/__init__.py
 lib/python2.6/test/__init__.pyc
 lib/python2.6/test/__init__.pyo
@@ -295,6 +296,9 @@ lib/python2.6/test/test_abstract_numbers.pyo
 lib/python2.6/test/test_aepack.py
 lib/python2.6/test/test_aepack.pyc
 lib/python2.6/test/test_aepack.pyo
+lib/python2.6/test/test_aifc.py
+lib/python2.6/test/test_aifc.pyc
+lib/python2.6/test/test_aifc.pyo
 lib/python2.6/test/test_al.py
 lib/python2.6/test/test_al.pyc
 lib/python2.6/test/test_al.pyo
@@ -816,6 +820,9 @@ lib/python2.6/test/test_largefile.pyo
 lib/python2.6/test/test_lib2to3.py
 lib/python2.6/test/test_lib2to3.pyc
 lib/python2.6/test/test_lib2to3.pyo
+lib/python2.6/test/test_linecache.py
+lib/python2.6/test/test_linecache.pyc
+lib/python2.6/test/test_linecache.pyo
 lib/python2.6/test/test_linuxaudiodev.py
 lib/python2.6/test/test_linuxaudiodev.pyc
 lib/python2.6/test/test_linuxaudiodev.pyo
@@ -1113,6 +1120,9 @@ lib/python2.6/test/test_slice.pyo
 lib/python2.6/test/test_smtplib.py
 lib/python2.6/test/test_smtplib.pyc
 lib/python2.6/test/test_smtplib.pyo
+lib/python2.6/test/test_smtpnet.py
+lib/python2.6/test/test_smtpnet.pyc
+lib/python2.6/test/test_smtpnet.pyo
 lib/python2.6/test/test_socket.py
 lib/python2.6/test/test_socket.pyc
 lib/python2.6/test/test_socket.pyo