diff --git a/templates/python-fix-bluetooth.diff b/templates/python-fix-bluetooth.diff
deleted file mode 100644
index 3fc5aba9264..00000000000
--- a/templates/python-fix-bluetooth.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $
-
---- Modules/socketmodule.c.orig	2007-03-31 20:56:11.000000000 +0200
-+++ Modules/socketmodule.c
-@@ -357,7 +357,8 @@ const char *inet_ntop(int af, const void
- #define SOCKETCLOSE close
- #endif
- 
--#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)
-+#if (defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)) && \
-+    !defined(__NetBSD__) && !defined(__DragonFly__)
- #define USE_BLUETOOTH 1
- #if defined(__FreeBSD__)
- #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
diff --git a/templates/python-fix-build.diff b/templates/python-fix-build.diff
deleted file mode 100644
index 10ba88a296b..00000000000
--- a/templates/python-fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.pre.in.orig	2007-12-05 21:43:57.000000000 +0100
-+++ Makefile.pre.in	2008-09-30 16:56:46.000000000 +0200
-@@ -806,7 +806,7 @@ $(srcdir)/Lib/$(PLATDIR):
- 	export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
- 	export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
- 	export EXE; EXE="$(BUILDEXE)"; \
--	cd $(srcdir)/Lib/$(PLATDIR); ./regen
-+	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
- 
- # Install the include files
- INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
diff --git a/templates/python-fix-curses-module.diff b/templates/python-fix-curses-module.diff
deleted file mode 100644
index 80cd7c0398e..00000000000
--- a/templates/python-fix-curses-module.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $
-
---- Modules/_cursesmodule.c.orig	2008-01-26 15:03:51.000000000 +0100
-+++ Modules/_cursesmodule.c
-@@ -314,17 +314,9 @@ Window_NoArg2TupleReturnFunction(getpary
- 
- Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
--#if defined(__NetBSD__)
--Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
--#else
- Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
--#endif
- Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
--#if defined(__NetBSD__)
--Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
--#else
- Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
--#endif
- Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
-@@ -827,11 +819,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
-   } else if (rtn<=255)
-     return Py_BuildValue("c", rtn);
-   else
--#if defined(__NetBSD__)
--    return PyString_FromString(unctrl(rtn));
--#else
-     return PyString_FromString((char *)keyname(rtn));
--#endif
- }
- 
- static PyObject *
-@@ -2039,7 +2027,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
- }
- #endif /* HAVE_CURSES_IS_TERM_RESIZED */
- 
--#if !defined(__NetBSD__)
- static PyObject *
- PyCurses_KeyName(PyObject *self, PyObject *args)
- {
-@@ -2058,7 +2045,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
- 
-   return PyString_FromString((knp == NULL) ? "" : (char *)knp);
- }
--#endif
- 
- static PyObject *  
- PyCurses_KillChar(PyObject *self)  
-@@ -2603,9 +2589,7 @@ static PyMethodDef PyCurses_methods[] = 
- #ifdef HAVE_CURSES_IS_TERM_RESIZED
-   {"is_term_resized",     (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
- #endif
--#if !defined(__NetBSD__)
-   {"keyname",             (PyCFunction)PyCurses_KeyName, METH_VARARGS},
--#endif
-   {"killchar",            (PyCFunction)PyCurses_KillChar, METH_NOARGS}, 
-   {"longname",            (PyCFunction)PyCurses_longname, METH_NOARGS}, 
-   {"meta",                (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2714,9 +2698,7 @@ init_curses(void)
- 	SetDictInt("A_DIM",		A_DIM);
- 	SetDictInt("A_BOLD",		A_BOLD);
- 	SetDictInt("A_ALTCHARSET",	A_ALTCHARSET);
--#if !defined(__NetBSD__)
- 	SetDictInt("A_INVIS",           A_INVIS);
--#endif
- 	SetDictInt("A_PROTECT",         A_PROTECT);
- 	SetDictInt("A_CHARTEXT",        A_CHARTEXT);
- 	SetDictInt("A_COLOR",           A_COLOR);
-@@ -2788,7 +2770,6 @@ init_curses(void)
- 	  int key;
- 	  char *key_n;
- 	  char *key_n2;
--#if !defined(__NetBSD__)
- 	  for (key=KEY_MIN;key < KEY_MAX; key++) {
- 	    key_n = (char *)keyname(key);
- 	    if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
-@@ -2816,7 +2797,6 @@ init_curses(void)
- 	    if (key_n2 != key_n)
- 	      free(key_n2);
- 	  }
--#endif
- 	  SetDictInt("KEY_MIN", KEY_MIN);
- 	  SetDictInt("KEY_MAX", KEY_MAX);
- 	}
diff --git a/templates/python-fix-mremap.diff b/templates/python-fix-mremap.diff
deleted file mode 100644
index 0a09ce43a34..00000000000
--- a/templates/python-fix-mremap.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-at,v 1.2 2008/08/30 10:02:33 tron Exp $
-
-The first change is part of the fix for CVE-2008-2315 taken from Gentto.
-
---- Modules/mmapmodule.c.orig	2006-08-22 14:57:07.000000000 +0100
-+++ Modules/mmapmodule.c	2008-08-30 10:16:13.000000000 +0100
-@@ -223,7 +223,7 @@
- 		return(NULL);
- 
- 	/* silently 'adjust' out-of-range requests */
--	if ((self->pos + num_bytes) > self->size) {
-+	if (num_bytes > self->size - self->pos) {
- 		num_bytes -= (self->pos+num_bytes) - self->size;
- 	}
- 	result = Py_BuildValue("s#", self->data+self->pos, num_bytes);
-@@ -449,6 +449,9 @@
- 
- #ifdef MREMAP_MAYMOVE
- 		newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
-+#elif defined(__NetBSD__)
-+                newmap = mremap(self->data, self->size, self->data, new_size, 0);
-+
- #else
- 		newmap = mremap(self->data, self->size, new_size, 0);
- #endif
diff --git a/templates/python.tmpl b/templates/python.tmpl
index e51a76edb90..c14928b5844 100644
--- a/templates/python.tmpl
+++ b/templates/python.tmpl
@@ -2,15 +2,13 @@
 pkgname=python
 version=2.5.2
 wrksrc="Python-$version"
-patch_files="python-fix-build.diff python-fix-curses-module.diff 
- python-fix-bluetooth.diff python-fix-mremap.diff"
 distfiles="
 http://www.python.org/ftp/python/$version/Python-$version@.tar.bz2"
 configure_args="--with-threads --enable-shared"
 build_style=gnu_configure
 short_desc="Interpreted, interactive, object-oriented programming language"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=b23b02739833e6730799c5866e2b77aae884b63f
+checksum=f2f80e2a62a039e9a1ffa0fdf58707b2d12b3ff33c56472b46bb6d53f45e083e
 long_desc="
  Python is an interpreted, interactive, object-oriented programming language
  that combines remarkable power with very clear syntax. For an introduction