diff --git a/templates/bison.tmpl b/templates/bison.tmpl
index c474581466f..9d9ba927f02 100755
--- a/templates/bison.tmpl
+++ b/templates/bison.tmpl
@@ -3,10 +3,12 @@ pkgname=bison
 version=2.3
 distfiles="http://ftp.gnu.org/pub/gnu/bison/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="GNU yacc(1) replacement"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=c6a116d6b763fad3f4df6e303943e09ed080cb26
+checksum=b10d7e9e354be72aee4e4911cf19dd27b5c527d4e7200857365b5fcdeea0dffb
 long_desc="
  Bison is the GNU replacement for yacc(1). Some programs depend on
  extensions present in Bison."
+
+build_depends="m4-1.4.12"
+run_depends="m4-1.4.12 glibc-2.8"
diff --git a/templates/m4.tmpl b/templates/m4.tmpl
index b19beacdb62..b4deaf903a0 100644
--- a/templates/m4.tmpl
+++ b/templates/m4.tmpl
@@ -3,10 +3,10 @@ pkgname=m4
 version=1.4.12
 distfiles="http://ftp.gnu.org/gnu/m4/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
-configure_args="--program-prefix=g"
+configure_args="-enable-changeword"
 short_desc="GNU version of UNIX m4 macro language processor"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=ff55d95da2a52e9a9b8f5bb76072e1b08318ba2a
+checksum=855217de304616931844f54bd00a1e03e92452f85de6caeec47b0e8244881ba3
 long_desc="
     GNU m4 is an implementation of the traditional UNIX macro
  processor. It is mostly SVR4 compatible, although it has some
@@ -16,3 +16,4 @@ long_desc="
  generating configure scripts, but not for running them."
 
 ignore_files="charset.alias"
+run_depends="glibc-2.8"