diff --git a/screen/build.sh b/screen/build.sh
index 79ae2be..f89a8c0 100755
--- a/screen/build.sh
+++ b/screen/build.sh
@@ -3,32 +3,22 @@
 # 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=screen
-version=4.0.2
-pkgver=2
+version=4.0.3
+pkgver=1
 source[0]=$topdir-$version.tar.gz
 # If there are no patches, simply comment this
-#patch[0]=
+patch[0]=screen-4.0.2-makefile-madness.diff
 
 # Source function library
 . ${BUILDPKG_BASE}/scripts/buildpkg.functions
 
-# Fill in pkginfo values if necessary
-# using pkgname,name,pkgcat,pkgvendor & pkgdesc
-name="Screen"
-pkgcat="application"
-pkgvendor="http://www.guckes.net/screen/"
-pkgdesc="A fullscreen window manager for consoles"
-
-# Define script functions and register them
-METHODS=""
-reg() {
-    METHODS="$METHODS $1"
-}
+# Global settings
 
 reg prep
 prep()
@@ -47,9 +37,9 @@ install()
 {
     generic_install DESTDIR
     setdir source
-    $CP terminfo/screeninfo.src $stagedir$prefix/share/$topdir
-    $MKDIR -p $stagedir$prefix/etc
-    $CP etc/etcscreenrc $stagedir$prefix/etc/screenrc
+    ${__cp} terminfo/screeninfo.src $stagedir$prefix/share/$topdir
+    ${__mkdir} -p $stagedir$prefix/etc
+    ${__cp} etc/etcscreenrc $stagedir$prefix/etc/screenrc
     # Add two useful hacks to screenrc
     cat << EOF >> $stagedir$prefix/etc/screenrc
 # special xterm hardstatus: use the window title.
@@ -57,7 +47,7 @@ termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
 
 hardstatus string "[screen %n%?: %t%?] %h"
 EOF
-    $RM -f $stagedir$prefix/info/dir
+    doc NEWS README doc/README.DOTSCREEN doc/FAQ
 }
 
 reg pack
@@ -75,42 +65,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/screen/meta/pkgdef b/screen/meta/pkgdef
new file mode 100644
index 0000000..64f6253
--- /dev/null
+++ b/screen/meta/pkgdef
@@ -0,0 +1,13 @@
+[screen]
+pkgname="${pkgprefix}${topdir}"
+name="$topdir - Terminal multiplexer"
+pkgver="$pkgver"
+pkgvendor="http://ftp.uni-erlangen.de/pub/utilities/screen/"
+pkgdesc="Runs separate screens on a single terminal"
+files(4755,root,bin)
+$_bindir/screen-*
+files(-,root,bin)
+$_bindir/screen
+$_sharedir
+$_sysconfdir
+
diff --git a/screen/meta/pkginfo.in b/screen/meta/pkginfo.in
deleted file mode 100644
index 95b0128..0000000
--- a/screen/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/screen/meta/postinstall b/screen/meta/postinstall.screen
similarity index 67%
rename from screen/meta/postinstall
rename to screen/meta/postinstall.screen
index 9163a02..ccc4b29 100644
--- a/screen/meta/postinstall
+++ b/screen/meta/postinstall.screen
@@ -8,7 +8,3 @@ TIC=/usr/5bin/tic
 
 # install terminfo
 ${TIC} ${SHAREDIR}/screeninfo.src
-
-# Make screen suid root
-chown root:bin ${BASEDIR}/bin/screen-4.0.2
-chmod 4755 ${BASEDIR}/bin/screen-4.0.2
diff --git a/screen/meta/relnotes b/screen/meta/relnotes
new file mode 100644
index 0000000..bd83629
--- /dev/null
+++ b/screen/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/screen/src/screen-4.0.2-makefile-madness.diff b/screen/src/screen-4.0.2-makefile-madness.diff
new file mode 100644
index 0000000..5ec8376
--- /dev/null
+++ b/screen/src/screen-4.0.2-makefile-madness.diff
@@ -0,0 +1,21 @@
+--- screen-4.0.2/Makefile.in.orig	2004-07-14 14:25:12.290000000 +0200
++++ screen-4.0.2/Makefile.in	2004-07-14 14:27:18.780000000 +0200
+@@ -74,7 +74,6 @@
+ 	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
+ 		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
+ 	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
+-	-chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
+ # This doesn't work if $(bindir)/screen is a symlink
+ 	-if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
+ 	rm -f $(DESTDIR)$(bindir)/screen
+@@ -84,10 +83,6 @@
+ ###############################################################################
+ install: installdirs install_bin
+ 	cd doc ; $(MAKE) install
+-	-if [ -d /usr/lib/terminfo ]; then \
+-		PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
+-		chmod 644 /usr/lib/terminfo/s/screen*; \
+-	fi
+ # Better do this by hand. E.g. under RCS...
+ #	cat ${srcdir}/terminfo/screencap >> /etc/termcap
+ 	@echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually."