diff --git a/devel/m4/distinfo b/devel/m4/distinfo
index 57db995ed..955aea2d2 100644
--- a/devel/m4/distinfo
+++ b/devel/m4/distinfo
@@ -4,7 +4,9 @@ SHA1 (m4-1.4.17.tar.gz) = 4f80aed6d8ae3dacf97a0cb6e989845269e342f0
 RMD160 (m4-1.4.17.tar.gz) = d81675f1d358ce5eee27184a9d946acfc97a912b
 SHA512 (m4-1.4.17.tar.gz) = 211bac8ea73723fa1e95a05efa93b962151aee73f92e6a0792a345789b5d2bfba93b37a2bf416a37e6fc32f093b12246bbf50899054979efea5819e5fa48b9c9
 Size (m4-1.4.17.tar.gz) = 1820658 bytes
-SHA1 (patch-ab) = 9e9527cdd4b7ba3501d603f0e5ca60c2150e4359
+SHA1 (patch-ab) = 7017775b13e2831cdcbfb0412de4838b5d9b3ba0
+SHA1 (patch-ac) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-isnan.c) = a960f35e5168bed47c5924e36bfb254dc1a44621
 SHA1 (patch-lib_fpending.h) = 6f29893c24b03916200f36867ad30ba101f8ef16
+SHA1 (patch-lib_stdio-impl.h) = bfcb20e99c9dad4b4ae975d7f7e6d5a1b12ffd25
 SHA1 (patch-lib_stdio.in.h) = cc5a8572e274b576a154c7a6b14f0a14de5abacd
diff --git a/devel/m4/hacks.mk b/devel/m4/hacks.mk
index 4f5dc943e..f630e5709 100644
--- a/devel/m4/hacks.mk
+++ b/devel/m4/hacks.mk
@@ -23,4 +23,9 @@ PKG_HACKS+=		optimisation
 BUILDLINK_TRANSFORM+=	rm:-O[0-9]*
 .endif
 
+.if !empty(PKGSRC_COMPILER:Mclang) && ${OPSYS} == "NetBSD" && ${OS_VARIANT}
+PKG_HACKS+=		Force no optimisations whith clang on Minix
+BUILDLINK_TRANSFORM+=	rename:-O[0-9]*:-O0
+.endif
+
 .endif	# M4_HACKS_MK
diff --git a/devel/m4/patches/patch-ab b/devel/m4/patches/patch-ab
index 568f1625a..7cfa07256 100644
--- a/devel/m4/patches/patch-ab
+++ b/devel/m4/patches/patch-ab
@@ -1,13 +1,11 @@
-$NetBSD: patch-ab,v 1.13 2013/10/04 21:02:11 wiz Exp $
-
---- lib/fseeko.c.orig	2013-09-22 06:15:55.000000000 +0000
-+++ lib/fseeko.c
-@@ -125,7 +125,7 @@ fseeko (FILE *fp, off_t offset, int when
+--- lib/fseeko.c.orig	Sun Sep 22 06:15:55 2013
++++ lib/fseeko.c	Fri Apr 18 00:06:46 2014
+@@ -125,7 +125,7 @@ fseeko (FILE *fp, off_t offset, int whence)
        fp->_flags &= ~_IO_EOF_SEEN;
        fp->_offset = pos;
  #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
 -# if defined __CYGWIN__
-+# if defined(__CYGWIN__) || defined(__NetBSD__)
++# if defined(__CYGWIN__) || defined(__NetBSD__) || defined(__minix)
        /* fp_->_offset is typed as an integer.  */
        fp_->_offset = pos;
  # else
diff --git a/devel/m4/patches/patch-ac b/devel/m4/patches/patch-ac
new file mode 100644
index 000000000..e69de29bb
diff --git a/devel/m4/patches/patch-lib_stdio-impl.h b/devel/m4/patches/patch-lib_stdio-impl.h
new file mode 100644
index 000000000..f1717babc
--- /dev/null
+++ b/devel/m4/patches/patch-lib_stdio-impl.h
@@ -0,0 +1,20 @@
+--- lib/stdio-impl.h.orig	Sun Sep 22 06:20:02 2013
++++ lib/stdio-impl.h	Fri Apr 18 00:02:53 2014
+@@ -21,7 +21,7 @@
+ 
+ /* BSD stdio derived implementations.  */
+ 
+-#if defined __NetBSD__                         /* NetBSD */
++#if defined __NetBSD__ || defined __minix                        /* NetBSD */
+ /* Get __NetBSD_Version__.  */
+ # include <sys/param.h>
+ #endif
+@@ -57,7 +57,7 @@
+ #  define fp_ fp
+ # endif
+ 
+-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */
++# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__  || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Android */
+   /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
+      and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
+   struct __sfileext