diff --git a/m4/build.sh b/m4/build.sh
index 274055b..1cd5f1b 100755
--- a/m4/build.sh
+++ b/m4/build.sh
@@ -3,33 +3,24 @@
 # This is a generic build.sh script
 # It can be used nearly unmodified with many packages
 # 
-# The concept of "method" registering and the logic that implements it was shamelessly
-# stolen from jhlj's Compile.sh script :)
+# build.sh helper functions
+. ${BUILDPKG_BASE}/scripts/build.sh.functions
 #
+###########################################################
 # Check the following 4 variables before running the script
 topdir=m4
-version=1.4.1
-pkgver=2
-source[0]=$topdir-$version.tar.gz
+version=1.4.11
+pkgver=1
+source[0]=$topdir-$version.tar.bz2
 # If there are no patches, simply comment this
-patch[0]=m4-1.4.1-sec.patch
-patch[1]=m4-1.4.1-configure.patch
+#patch[0]=
 
 # Source function library
 . ${BUILDPKG_BASE}/scripts/buildpkg.functions
 
-# Fill in pkginfo values if necessary
-# using pkgname,name,pkgcat,pkgvendor & pkgdesc
-name="GNU m4 - Macro processor"
-pkgcat="application"
-pkgvendor="http://www.gnu.org"
-pkgdesc="An implementation of the traditional UNIX macro processor"
-
-# Define script functions and register them
-METHODS=""
-reg() {
-    METHODS="$METHODS $1"
-}
+# Global settings
+export CPPFLAGS="-I$prefix/include"
+export LDFLAGS="-L$prefix/lib -R$prefix/lib"
 
 reg prep
 prep()
@@ -40,22 +31,25 @@ prep()
 reg build
 build()
 {
-    setdir source
-    autoreconf -f
     generic_build
 }
 
+reg check
+check()
+{
+    generic_check
+}
+
 reg install
 install()
 {
-    setdir source
-    $MAKE_PROG prefix=$stagedir INSTALL_DATA="/usr/local/bin/install -c -m644" install
+    generic_install DESTDIR
 }
 
 reg pack
 pack()
 {
-    generic_pack shortroot
+    generic_pack
 }
 
 reg distclean
@@ -67,42 +61,4 @@ distclean()
 ###################################################
 # No need to look below here
 ###################################################
-
-reg all
-all()
-{
-    for METHOD in $METHODS 
-    do
-	case $METHOD in
-	     all*|*clean) ;;
-	     *) $METHOD
-		;;
-	esac
-    done
-
-}
-
-reg
-usage() {
-    echo Usage $0 "{"$(echo $METHODS | tr " " "|")"}"
-    exit 1
-}
-
-OK=0
-for METHOD in $*
-do
-    METHOD=" $METHOD *"
-    if [ "${METHODS%$METHOD}" == "$METHODS" ] ; then
-	usage
-    fi
-    OK=1
-done
-
-if [ $OK = 0 ] ; then
-    usage;
-fi
-
-for METHOD in $*
-do
-    ( $METHOD )
-done
+build_sh $*
diff --git a/m4/meta/pkgdef b/m4/meta/pkgdef
new file mode 100644
index 0000000..d88ea9a
--- /dev/null
+++ b/m4/meta/pkgdef
@@ -0,0 +1,9 @@
+[m4]
+pkgname="${pkgprefix}${topdir}"
+name="$topdir - GNU m4"
+pkgcat="application"
+pkgvendor="http://www.gnu.org/software/m4/m4.html"
+shortdesc="Macro processor"
+pkgver="$pkgver"
+files(-,root,bin)
+*
diff --git a/m4/meta/pkginfo.in b/m4/meta/pkginfo.in
deleted file mode 100644
index 95b0128..0000000
--- a/m4/meta/pkginfo.in
+++ /dev/null
@@ -1,11 +0,0 @@
-PKG="%%pkgname%%"
-NAME="%%name%%"
-ARCH="sparc"
-VERSION="%%version%%"
-CATEGORY="%%pkgcat%%"
-VENDOR="%%pkgvendor%%"
-EMAIL="Tom G. Christenen - tgc@statsbiblioteket.dk"
-PSTAMP="%%pkgver%%"
-BASEDIR="%%topinstalldir%%"
-CLASSES="none"
-DESC="%%pkgdesc%%"
diff --git a/m4/meta/relnotes b/m4/meta/relnotes
new file mode 100644
index 0000000..bd83629
--- /dev/null
+++ b/m4/meta/relnotes
@@ -0,0 +1,27 @@
+PACKAGE DETAILS
+---------------
+Name:	    %%PKGNAME%%
+Version:    %%SOURCE_AND_VER%%
+Vendor:	    %%VENDOR%%
+Packager:   %%PKGEDBY%%
+
+Source (sha1sum):
+%%SOURCE_SHA1SUM%%
+
+BUILD DETAILS
+-------------
+Compiler:
+%%COMPILER%%
+
+Environment:
+%%ENVIRONMENT%%
+
+Configure:
+%%CONFIGURE%%
+
+KNOWN DEPENDENCIES
+------------------
+%%DEPENDENCIES%%
+
+ERRORS/MISCELLANEOUS
+--------------------
diff --git a/m4/src/m4-1.4.1-configure.patch b/m4/src/m4-1.4.1-configure.patch
deleted file mode 100644
index 3e1d1b4..0000000
--- a/m4/src/m4-1.4.1-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4-1.4.1/configure.in.fix	Sun Jan 20 04:20:24 2002
-+++ m4-1.4.1/configure.in	Sun Jan 20 04:20:33 2002
-@@ -2,8 +2,6 @@
- # Copyright (C) 1991, 1993, 1994 Free Software Foundation, Inc.
- # Process this file with autoconf to produce a configure script.
- 
--undefine([changeword])
--
- AC_INIT(src/m4.c)
- AC_CONFIG_HEADER(config.h)
- AC_ARG_PROGRAM
diff --git a/m4/src/m4-1.4.1-sec.patch b/m4/src/m4-1.4.1-sec.patch
deleted file mode 100644
index f3ebfcc..0000000
--- a/m4/src/m4-1.4.1-sec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- m4-1.4.1/src/m4.c.sec	Tue Feb 13 13:27:07 2001
-+++ m4-1.4.1/src/m4.c	Tue Feb 13 13:35:49 2001
-@@ -369,7 +369,7 @@
- 
-       case 'o':
- 	if (!debug_set_output (optarg))
--	  error (0, errno, optarg);
-+	  error (0, errno, "%s", optarg);
- 	break;
- 
-       case 's':
-@@ -466,7 +466,7 @@
- 	    fp = path_search (argv[optind]);
- 	    if (fp == NULL)
- 	      {
--		error (0, errno, argv[optind]);
-+		error (0, errno, "%s", argv[optind]);
- 		continue;
- 	      }
- 	    else