--- Include/pystrcmp.h.orig	Wed Dec 19 10:22:54 2007
+++ Include/pystrcmp.h	Sun Sep 14 16:26:54 2008
@@ -8,7 +8,7 @@
 PyAPI_FUNC(int) PyOS_mystrnicmp(const char *, const char *, Py_ssize_t);
 PyAPI_FUNC(int) PyOS_mystricmp(const char *, const char *);
 
-#ifdef MS_WINDOWS
+#if defined(MS_WINDOWS) || defined(PYOS_OS2)
 #define PyOS_strnicmp strnicmp
 #define PyOS_stricmp stricmp
 #else
--- Lib/test/test_io.py.orig	Fri Aug 15 07:04:30 2008
+++ Lib/test/test_io.py	Sun Sep 14 18:05:14 2008
@@ -201,7 +201,7 @@
         # On Windows and Mac OSX this test comsumes large resources; It takes
         # a long time to build the >2GB file and takes >2GB of disk space
         # therefore the resource must be enabled to run this test.
-        if sys.platform[:3] == 'win' or sys.platform == 'darwin':
+        if sys.platform[:3] in ('win', 'os2') or sys.platform == 'darwin':
             if not test_support.is_resource_enabled("largefile"):
                 print("\nTesting large file ops skipped on %s." % sys.platform,
                       file=sys.stderr)
--- Objects/floatobject.c.orig	Tue Sep  9 17:24:30 2008
+++ Objects/floatobject.c	Sun Sep 14 16:31:12 2008
@@ -1339,12 +1339,12 @@
 		s++;
 
 	/* infinities and nans */
-	if (PyOS_mystrnicmp(s, "nan", 4) == 0) {
+	if (PyOS_strnicmp(s, "nan", 4) == 0) {
 		x = Py_NAN;
 		goto finished;
 	}
-	if (PyOS_mystrnicmp(s, "inf", 4) == 0 ||
-	    PyOS_mystrnicmp(s, "infinity", 9) == 0) {
+	if (PyOS_strnicmp(s, "inf", 4) == 0 ||
+	    PyOS_strnicmp(s, "infinity", 9) == 0) {
 		x = sign*Py_HUGE_VAL;
 		goto finished;
 	}
--- Python/pymath.c.orig	Sat Apr 19 09:13:06 2008
+++ Python/pymath.c	Sun Sep 14 17:20:20 2008
@@ -35,6 +35,8 @@
 #endif /* HAVE_COPYSIGN */
 
 #ifndef HAVE_LOG1P
+#include <float.h>
+
 double
 log1p(double x)
 {