diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index 0f325ccb1dc5..9c96bd36f3c3 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	3.0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
diff --git a/archivers/rpm/files/patch-bi b/archivers/rpm/files/patch-bi
index d4e23f73235b..2f4b57a890a3 100644
--- a/archivers/rpm/files/patch-bi
+++ b/archivers/rpm/files/patch-bi
@@ -1,6 +1,18 @@
---- lib/fs.c.orig	Thu Nov  2 12:54:47 2000
-+++ lib/fs.c	Thu Nov  2 12:55:32 2000
-@@ -129,8 +129,10 @@
+--- lib/fs.c.orig	Wed Jun 14 21:34:30 2000
++++ lib/fs.c	Tue Mar 20 22:24:58 2001
+@@ -12,6 +12,11 @@
+ /*@only@*/ /*@null@*/ static const char ** fsnames = NULL;
+ static int numFilesystems = 0;
+ 
++/* dummy getmntent() for FreeBSD */
++our_mntent *getmntent(FILE *filep) {
++  return NULL;
++}
++
+ void freeFilesystems(void)
+ {
+     if (filesystems) {
+@@ -129,8 +134,10 @@
  #   if GETMNTENT_ONE || GETMNTENT_TWO
  	mtab = fopen(MOUNTED, "r");
  	if (!mtab) {
diff --git a/archivers/rpm/files/patch-bj b/archivers/rpm/files/patch-bj
new file mode 100644
index 000000000000..b48019f66759
--- /dev/null
+++ b/archivers/rpm/files/patch-bj
@@ -0,0 +1,14 @@
+--- system.h.orig	Tue Mar 20 22:24:05 2001
++++ system.h	Tue Mar 20 22:24:30 2001
+@@ -351,9 +351,9 @@
+ # elif HAVE_STRUCT_MNTTAB
+ #  include <stdio.h>
+ #  include <mnttab.h>
+-   struct our_mntent {
++   typedef struct our_mntent {
+        char * our_mntdir;
+-   };
++   } our_mntent;
+    struct our_mntent *getmntent(FILE *filep);
+ #  define our_mntent struct our_mntent
+ # else