diff --git a/diffutils/build.sh b/diffutils/build.sh
index 7c8a315..f92f62f 100755
--- a/diffutils/build.sh
+++ b/diffutils/build.sh
@@ -3,31 +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=diffutils
 version=2.8.1
-pkgver=2
+pkgver=1
 source[0]=$topdir-$version.tar.gz
 # If there are no patches, simply comment this
 #patch[0]=
 
 # Source function library
-. ${HOME}/buildpkg/scripts/buildpkg.functions
+. ${BUILDPKG_BASE}/scripts/buildpkg.functions
 
-# Fill in pkginfo values if necessary
-# using pkgname,name,pkgcat,pkgvendor & pkgdesc
-name="GNU diffutils"
-pkgvendor="http://www.gnu.org"
-pkgdesc="diffutils - Finds differences between and among files"
-
-# 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()
@@ -38,16 +31,20 @@ prep()
 reg build
 build()
 {
-    setdir source
-    ./configure --prefix=$prefix --disable-nls
-    $MAKE_PROG
+    generic_build
+}
+
+reg check
+check()
+{
+    generic_check
 }
 
 reg install
 install()
 {
     generic_install DESTDIR
-    $RM -f $stagedir$prefix/info/dir
+    doc NEWS THANKS AUTHORS COPYING
 }
 
 reg pack
@@ -65,42 +62,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/diffutils/meta/pkgdef b/diffutils/meta/pkgdef
new file mode 100644
index 0000000..6c12054
--- /dev/null
+++ b/diffutils/meta/pkgdef
@@ -0,0 +1,12 @@
+[diffutils]
+pkgname="${pkgprefix}diffu"
+name="$topdir - GNU diffutils"
+pkgcat="application"
+pkgvendor="http://www.gnu.org/software/diffutils/diffutils.html"
+shortdesc="Utilities that displays difference between and among text files"
+pkgver="$pkgver"
+files(-,root,bin)
+default_docs
+$_bindir
+$_infodir
+$_mandir
diff --git a/diffutils/meta/pkginfo.in b/diffutils/meta/pkginfo.in
deleted file mode 100644
index 95b0128..0000000
--- a/diffutils/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/diffutils/meta/relnotes b/diffutils/meta/relnotes
new file mode 100644
index 0000000..bd83629
--- /dev/null
+++ b/diffutils/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
+--------------------