Index: Makefile
===================================================================
--- Makefile	(revision 352674)
+++ Makefile	(working copy)
@@ -28,6 +28,7 @@
 	${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py
 	${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/Modules/bsddb.h
 	${REINPLACE_CMD} 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},' ${WRKSRC}/setup2.py
+	${REINPLACE_CMD} 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},' ${WRKSRC}/setup3.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
Index: files/patch-setup3.py
===================================================================
--- files/patch-setup3.py	(revision 352674)
+++ files/patch-setup3.py	(working copy)
@@ -23,3 +23,12 @@
      else:
          if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
          libname = []
+@@ -332,7 +329,7 @@
+ 
+     # read db.h to figure out what version of Berkeley DB this is
+     ver = None
+-    db_h_lines = open(os.path.join(incdir, 'db.h'), 'r').readlines()
++    db_h_lines = open('%%BDB_INCLUDE_DIR%%/db.h', 'r').readlines()
+     db_ver_re = re.compile(
+         r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')
+     db_ver2 = db_ver