diff --git a/databases/db2/Makefile b/databases/db2/Makefile
index 0b615431c6cd..88dc6f065309 100644
--- a/databases/db2/Makefile
+++ b/databases/db2/Makefile
@@ -1,45 +1,44 @@
 # ports collection makefile for:	Berkeley DB
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	db
 PORTVERSION=	2.7.7
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
 
 MAINTAINER=	ports@FreeBSD.org
 
 PORTCOMMENT=	The Berkeley DB package, revision 2
 
 Y2K=		http://www.sleepycat.com/faq.html#A8
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx
-CFLAGS+=	-fpermissive
 
 post-install:
 	@-${RM} -fr ${PREFIX}/share/examples/db2
 	${MKDIR} ${PREFIX}/share/examples/db2
 	cd ${WRKSRC}/..; \
 	    tar -cf - --exclude tags examples/ examples_cxx/ examples_java/. \
 		| ( cd ${PREFIX}/share/examples/db2; tar xf - )
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you"
 	@${ECHO_MSG} "have a working copy of the JDK (v1.1) installed."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "To build java support, please read:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "and follow the directions therein."
 
 .include <bsd.port.mk>
diff --git a/databases/db2/files/patch-ab b/databases/db2/files/patch-ab
new file mode 100644
index 000000000000..16160886f375
--- /dev/null
+++ b/databases/db2/files/patch-ab
@@ -0,0 +1,11 @@
+--- ../include/db_cxx.h.orig	Tue Aug 31 13:45:43 1999
++++ ../include/db_cxx.h	Sat Sep 14 14:50:27 2002
+@@ -717,7 +717,7 @@
+     // call set_error_stream() to force all errors to a C++ stream.
+     // It is unwise to mix these approaches.
+     //
+-    void set_error_stream(class ostream*);
++    void set_error_stream(ostream*);
+ 
+     // used internally
+     static int runtime_error(const char *caller, int err,
diff --git a/databases/db2/files/patch-ac b/databases/db2/files/patch-ac
new file mode 100644
index 000000000000..83873426b6ed
--- /dev/null
+++ b/databases/db2/files/patch-ac
@@ -0,0 +1,11 @@
+--- ../cxx/cxx_app.cpp.orig	Wed Dec 16 14:53:47 1998
++++ ../cxx/cxx_app.cpp	Sat Sep 14 14:50:30 2002
+@@ -125,7 +125,7 @@
+ // db_env triggered the call.  A user that has multiple DB_ENVs
+ // will simply not be able to have different streams for each one.
+ //
+-void DbEnv::set_error_stream(class ostream *stream)
++void DbEnv::set_error_stream(ostream *stream)
+ {
+     error_stream_ = stream;
+