Index: configure
===================================================================
--- configure	(revision 66476)
+++ configure	(working copy)
@@ -2076,7 +2076,7 @@
   # 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.
-  OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0123])
+  OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[01234])
     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
Index: configure.in
===================================================================
--- configure.in	(revision 66476)
+++ configure.in	(working copy)
@@ -251,7 +251,7 @@
   # 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.
-  OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0123@:>@) 
+  OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@01234@:>@) 
     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
Index: Lib/test/test_fileio.py
===================================================================
--- Lib/test/test_fileio.py	(revision 66476)
+++ Lib/test/test_fileio.py	(working copy)
@@ -150,6 +150,7 @@
                     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)
Index: Modules/_multiprocessing/multiprocessing.c
===================================================================
--- Modules/_multiprocessing/multiprocessing.c	(revision 66476)
+++ Modules/_multiprocessing/multiprocessing.c	(working copy)
@@ -7,6 +7,7 @@
  */
 
 #include "multiprocessing.h"
+#include <sys/uio.h>
 
 PyObject *create_win32_namespace(void);
 
Index: pyconfig.h.in
===================================================================
--- pyconfig.h.in	(revision 66476)
+++ pyconfig.h.in	(working copy)
@@ -360,7 +360,7 @@
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
-/* Define to 1 if you have the `readline' library (-lreadline). */
+/* Define if you have the readline library (-lreadline). */
 #undef HAVE_LIBREADLINE
 
 /* Define to 1 if you have the `resolv' library (-lresolv). */