diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index ff69e5d9f65..5d7797e2364 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,23 +1,21 @@
-# $OpenBSD: Makefile,v 1.19 2004/11/23 21:40:35 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2005/05/19 09:50:51 espie Exp $
 # $FreeBSD: Makefile,v 1.7 1997/06/16 08:22:35 max Exp $
 
 COMMENT=	"GNU m4"
 
-DISTNAME=	m4-1.4
+DISTNAME=	m4-1.4.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=m4/}
 
 HOMEPAGE=	http://www.gnu.org/software/m4/
 
-MAINTAINER=	Niklas Hallqvist <niklas@openbsd.org>
-
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c
 
-CONFIGURE_STYLE= gnu dest old
+CONFIGURE_STYLE= gnu 
 CONFIGURE_ARGS=	--program-prefix="g"
 
 post-install:
diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index aeba5102a9b..25f3f61ee33 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -1,4 +1,4 @@
-MD5 (m4-1.4.tar.gz) = 9eb2dd07740b2d2f3c7adb3e8d299bda
-RMD160 (m4-1.4.tar.gz) = fbbf125201f9fa8a89d3e645e4bb1a9d9b342a60
-SHA1 (m4-1.4.tar.gz) = 60bfd560128b9b60151c2c2441271043e803bbcf
-SIZE (m4-1.4.tar.gz) = 317588
+MD5 (m4-1.4.3.tar.gz) = 073048d747f2dbb3298e713059dd9ab3
+RMD160 (m4-1.4.3.tar.gz) = 9937fb316e278ae5a9fe4d69e9fd94479c197073
+SHA1 (m4-1.4.3.tar.gz) = bda692e58849bd53f37371bb59d87dd76b205b8b
+SIZE (m4-1.4.3.tar.gz) = 383347
diff --git a/devel/m4/patches/patch-doc_m4_texinfo b/devel/m4/patches/patch-doc_m4_texinfo
index d9ef0ef2175..a2922d583a4 100644
--- a/devel/m4/patches/patch-doc_m4_texinfo
+++ b/devel/m4/patches/patch-doc_m4_texinfo
@@ -1,20 +1,20 @@
-$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
+$OpenBSD: patch-doc_m4_texinfo,v 1.2 2005/05/19 09:50:51 espie Exp $
+--- doc/m4.texinfo.orig	Thu Mar 31 13:17:00 2005
++++ doc/m4.texinfo	Mon May 16 21:33:41 2005
 @@ -2,6 +2,7 @@
  @c %**start of header
  @setfilename m4.info
  @settitle GNU macro processor
 +@dircategory Programming & development tools
+ @c For double-sided printing, uncomment:
+ @c @setchapterpage odd
  @finalout
- @c %**end of header
+@@ -18,7 +19,7 @@
  
-@@ -17,7 +18,7 @@
- @ifinfo
- @format
- START-INFO-DIR-ENTRY
+ @dircategory GNU programming tools
+ @direntry
 -* m4: (m4).			A powerful macro processor.
 +* Gm4: (m4).			A powerful macro processor.
- END-INFO-DIR-ENTRY
- @end format
- @end ifinfo
+ @end direntry
+ 
+ @ifnottex
diff --git a/devel/m4/patches/patch-src_builtin_c b/devel/m4/patches/patch-src_builtin_c
deleted file mode 100644
index 8b2b689f3d9..00000000000
--- a/devel/m4/patches/patch-src_builtin_c
+++ /dev/null
@@ -1,18 +0,0 @@
-$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)
- {
-+  int fd;
-   if (bad_argc (argv[0], argc, 2, 2))
-     return;
--  mktemp (ARG (1));
-+  fd = mkstemp (ARG (1));
-+  if ( fd == -1 )
-+    err( 1, "can't create temp file %s", ARG (1) );
-+  close( fd );
-   obstack_grow (obs, ARG (1), strlen (ARG (1)));
- }
-