diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index bf557cf92598..6d8984480f0e 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fvwm
 PORTVERSION=	2.5.28
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm2-devel/files/patch-modules::FvwmCommand::FvwmCommand.c b/x11-wm/fvwm2-devel/files/patch-modules::FvwmCommand::FvwmCommand.c
deleted file mode 100644
index 2497c3e5458d..000000000000
--- a/x11-wm/fvwm2-devel/files/patch-modules::FvwmCommand::FvwmCommand.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/FvwmCommand/FvwmCommand.c.orig	Wed Jul  4 22:35:50 2001
-+++ modules/FvwmCommand/FvwmCommand.c	Wed Jul  4 22:35:52 2001
-@@ -927,7 +927,7 @@
- {
-   printf( "           %-20s x %ld, y %ld, desk %ld, max x %ld, max y %ld\n",
- 	  "new page",
--	  body[0], body[1], body[2], body[3], body[4]);
-+	  body[0], body[0], body[2], body[3], body[4]);
- }
- 
- /*************************************************************************
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index cbe66d52fd85..45860728bd9c 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fvwm
 PORTVERSION=	2.4.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm2/files/patch-ad b/x11-wm/fvwm2/files/patch-ad
deleted file mode 100644
index 2497c3e5458d..000000000000
--- a/x11-wm/fvwm2/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/FvwmCommand/FvwmCommand.c.orig	Wed Jul  4 22:35:50 2001
-+++ modules/FvwmCommand/FvwmCommand.c	Wed Jul  4 22:35:52 2001
-@@ -927,7 +927,7 @@
- {
-   printf( "           %-20s x %ld, y %ld, desk %ld, max x %ld, max y %ld\n",
- 	  "new page",
--	  body[0], body[1], body[2], body[3], body[4]);
-+	  body[0], body[0], body[2], body[3], body[4]);
- }
- 
- /*************************************************************************
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index cbe66d52fd85..45860728bd9c 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fvwm
 PORTVERSION=	2.4.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm24/files/patch-ad b/x11-wm/fvwm24/files/patch-ad
deleted file mode 100644
index 2497c3e5458d..000000000000
--- a/x11-wm/fvwm24/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/FvwmCommand/FvwmCommand.c.orig	Wed Jul  4 22:35:50 2001
-+++ modules/FvwmCommand/FvwmCommand.c	Wed Jul  4 22:35:52 2001
-@@ -927,7 +927,7 @@
- {
-   printf( "           %-20s x %ld, y %ld, desk %ld, max x %ld, max y %ld\n",
- 	  "new page",
--	  body[0], body[1], body[2], body[3], body[4]);
-+	  body[0], body[0], body[2], body[3], body[4]);
- }
- 
- /*************************************************************************