diff --git a/devel/m4/patches/patch-aa b/devel/m4/patches/patch-aa
deleted file mode 100644
index d115919e806..00000000000
--- a/devel/m4/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Sun Nov  6 05:52:26 1994
-+++ doc/Makefile.in	Mon Jun 16 16:08:39 1997
-@@ -40,7 +40,7 @@
- info: m4.info
- 
- m4.info: m4.texinfo version.texi
--	cd $(srcdir) && $(MAKEINFO) m4.texinfo
-+	cd $(srcdir) && rm -f m4.info* && $(MAKEINFO) --no-split m4.texinfo
- 
- dvi: m4.dvi
- 
diff --git a/devel/m4/patches/patch-doc_Makefile_in b/devel/m4/patches/patch-doc_Makefile_in
new file mode 100644
index 00000000000..6075c4e91ca
--- /dev/null
+++ b/devel/m4/patches/patch-doc_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_Makefile_in,v 1.1 2001/07/10 23:55:17 brad Exp $
+--- doc/Makefile.in.orig	Sat Nov  5 15:52:26 1994
++++ doc/Makefile.in	Tue Jul 10 19:50:51 2001
+@@ -40,7 +40,7 @@ all: m4.info
+ info: m4.info
+ 
+ m4.info: m4.texinfo version.texi
+-	cd $(srcdir) && $(MAKEINFO) m4.texinfo
++	cd $(srcdir) && rm -f m4.info* && $(MAKEINFO) --no-split m4.texinfo
+ 
+ dvi: m4.dvi
+ 
diff --git a/devel/m4/patches/patch-ab b/devel/m4/patches/patch-doc_m4_texinfo
similarity index 69%
rename from devel/m4/patches/patch-ab
rename to devel/m4/patches/patch-doc_m4_texinfo
index aa51a00911e..d9ef0ef2175 100644
--- a/devel/m4/patches/patch-ab
+++ b/devel/m4/patches/patch-doc_m4_texinfo
@@ -1,5 +1,6 @@
---- doc/m4.texinfo.orig	Mon Oct 31 09:07:39 1994
-+++ doc/m4.texinfo	Mon Jun 16 16:36:44 1997
+$OpenBSD: patch-doc_m4_texinfo,v 1.1 2001/07/10 23:55:17 brad Exp $
+--- doc/m4.texinfo.orig	Sun Oct 30 19:07:39 1994
++++ doc/m4.texinfo	Tue Jul 10 19:50:51 2001
 @@ -2,6 +2,7 @@
  @c %**start of header
  @setfilename m4.info
diff --git a/devel/m4/patches/patch-ac b/devel/m4/patches/patch-src_builtin_c
similarity index 60%
rename from devel/m4/patches/patch-ac
rename to devel/m4/patches/patch-src_builtin_c
index 3bb076bc03a..8b2b689f3d9 100644
--- a/devel/m4/patches/patch-ac
+++ b/devel/m4/patches/patch-src_builtin_c
@@ -1,6 +1,7 @@
---- src/builtin.c.orig	Wed Aug 31 09:45:12 1994
-+++ src/builtin.c	Sat Jul 25 14:30:35 1998
-@@ -1076,9 +1076,13 @@
+$OpenBSD: patch-src_builtin_c,v 1.1 2001/07/10 23:55:17 brad Exp $
+--- src/builtin.c.orig	Wed Aug 31 12:45:12 1994
++++ src/builtin.c	Tue Jul 10 19:50:52 2001
+@@ -1076,9 +1076,13 @@ m4_sinclude (struct obstack *obs, int ar
  static void
  m4_maketemp (struct obstack *obs, int argc, token_data **argv)
  {