diff --git a/databases/py25-bsddb/Makefile b/databases/py25-bsddb/Makefile
index d70bb1cf02c9..8d5fdcf90805 100644
--- a/databases/py25-bsddb/Makefile
+++ b/databases/py25-bsddb/Makefile
@@ -1,47 +1,14 @@
-# New ports collection makefile for:    py-bsddb
-# Date created:         31 July 2003
-# Whom:                 Hye-Shik Chang <perky@FreeBSD.org>
+# New ports collection makefile for:    py25-bsddb
+# Date created:         2009-07-08
+# Whom:                 Li-Wen Hsu <lwhsu@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	bsddb
-PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	2
-CATEGORIES=	databases python
-MASTER_SITES=	${PYTHON_MASTER_SITES}
-MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	${PYTHON_DISTFILE}
+MASTERDIR=	${.CURDIR}/../py-bsddb
 
-MAINTAINER=	perky@FreeBSD.org
-COMMENT=	Python bindings to the Berkeley DB library
+MAINTAINER=	python@FreeBSD.org
 
-USE_BDB=	yes
-USE_PYTHON=	2.3+
-USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME=	_bsddb
-PYDISTUTILS_PKGVERSION=	0.0.0
-DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}/Modules
-MD5_FILE=	${PORTSDIR}/lang/python/distinfo
-MAKE_ENV=	BSDDB_VERSION=${BDB_LIB_NAME}
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/_bsddb.so
+USE_PYTHON=	2.5
 
-.include <bsd.port.pre.mk>
-
-post-extract:
-	@${CP} ${FILESDIR}/setup.py ${WRKSRC}
-
-.if ${PYTHON_REL} < 260
-BSDDB_PATCH=_bsddb.c
-.else
-BSDDB_PATCH=bsddb.h
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e \
-		's,^\(#include.*\)\(db\.h.*\)$$,\1${BDB_INCLUDE_DIR}/\2,' \
-		${WRKSRC}/${BSDDB_PATCH}
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/py25-bsddb/files/setup.py b/databases/py25-bsddb/files/setup.py
deleted file mode 100644
index 0e6dac715d2f..000000000000
--- a/databases/py25-bsddb/files/setup.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-# To use:
-#       python setup.py install
-#
-
-__version__ = "$FreeBSD: /tmp/pcvs/ports/databases/py25-bsddb/files/Attic/setup.py,v 1.2 2009-07-06 21:41:38 lwhsu Exp $"
-
-import os
-try:
-    import distutils
-    from distutils import sysconfig
-    from distutils.command.install import install
-    from distutils.core import setup, Extension
-except:
-    raise SystemExit, "Distutils problem"
-
-prefix = sysconfig.PREFIX
-inc_dirs = [prefix + "/include"]
-lib_dirs = [prefix + "/lib"]
-libs = [os.environ['BSDDB_VERSION']]
-
-setup(name = "_bsddb",
-      description = "BSDDB Extension to Python",
-      
-      ext_modules = [Extension('_bsddb', ['_bsddb.c'],
-                               include_dirs = inc_dirs,
-                               libraries = libs,
-                               library_dirs = lib_dirs)]
-      )
diff --git a/databases/py25-bsddb/pkg-descr b/databases/py25-bsddb/pkg-descr
deleted file mode 100644
index eca654c2b7ae..000000000000
--- a/databases/py25-bsddb/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings to the Berkeley DB library.