diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 300beda1a773..ce9d80a4defa 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rpc2
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/rpc2/src/ \
 		ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/ \
diff --git a/devel/rpc2/distinfo b/devel/rpc2/distinfo
index 376d25be5de7..3400e9c9dae6 100644
--- a/devel/rpc2/distinfo
+++ b/devel/rpc2/distinfo
@@ -1,3 +1,3 @@
-MD5 (rpc2-2.4.tar.gz) = 85e73e58a541859f6b8475459746cf27
-SHA256 (rpc2-2.4.tar.gz) = eb3004e82c5aa22f38dcdc1d29b98acd7038f2b235460f92fdc4cd41f459d2a3
-SIZE (rpc2-2.4.tar.gz) = 607410
+MD5 (rpc2-2.5.tar.gz) = bb3119a6cc2a1ddafdadefb6a805fa5c
+SHA256 (rpc2-2.5.tar.gz) = 7c97d3530d4c98d54acffe1dbdea2b05d7a67c7564b6b44914070b9cd6222588
+SIZE (rpc2-2.5.tar.gz) = 607817
diff --git a/devel/rpc2/files/patch-rp2gen_symtab.c b/devel/rpc2/files/patch-rp2gen_symtab.c
deleted file mode 100644
index 2b9f6416248c..000000000000
--- a/devel/rpc2/files/patch-rp2gen_symtab.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- rp2gen/symtab.c.orig	Fri Oct 20 09:04:36 2006
-+++ rp2gen/symtab.c	Fri Oct 20 09:19:18 2006
-@@ -53,6 +53,12 @@
- extern VAR *make_var();
- ENTRY *find();
- 
-+/*
-+ * If this is not prototyped its return value defaults to int which results
-+ * in bogus results on systems where sizeof(void*) > sizeof(int).
-+ */
-+extern RPC2_TYPE *rpc2_struct_type(VAR **);
-+
- /* This module uses external chaining */
- 
- #define SYMTAB_SIZE	50
diff --git a/devel/rpc2/files/patch-secure_secure_init.c b/devel/rpc2/files/patch-secure_secure_init.c
deleted file mode 100644
index 152f4e302162..000000000000
--- a/devel/rpc2/files/patch-secure_secure_init.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- secure/secure_init.c.orig	Thu Oct  5 14:51:00 2006
-+++ secure/secure_init.c	Thu Oct  5 14:52:06 2006
-@@ -13,6 +13,8 @@
- 			Additional copyrights
- #*/
- 
-+#include <netinet/in.h>  /* ``struct sockaddr_in'' in (at least) FreeBSD */
-+
- #include <stdio.h>
- #include <string.h>
- #include <syslog.h>