diff --git a/curl/build.sh b/curl/build.sh
new file mode 100755
index 0000000..ac54195
--- /dev/null
+++ b/curl/build.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+#
+# This is a generic build.sh script
+# It can be used nearly unmodified with many packages
+# 
+# build.sh helper functions
+. ${BUILDPKG_BASE}/scripts/build.sh.functions
+#
+###########################################################
+# Check the following 4 variables before running the script
+topdir=curl
+version=7.18.2
+pkgver=1
+source[0]=$topdir-$version.tar.bz2
+# If there are no patches, simply comment this
+#patch[0]=
+
+# Source function library
+. ${BUILDPKG_BASE}/scripts/buildpkg.functions
+
+# Global settings
+export CPPFLAGS="-I$prefix/include"
+export LDFLAGS="-L$prefix/lib -R$prefix/lib"
+
+configure_args="$configure_args --enable-static=no --enable-http --enable-ftp --enable-file --disable-ldap --enable-manual --disable-ipv6 --enable-cookies --enable-crypto --with-egd-socket=/var/run/egd-pool --with-libidn"
+
+reg prep
+prep()
+{
+    generic_prep
+}
+
+reg build
+build()
+{
+    generic_build
+}
+
+reg check
+check()
+{
+    generic_check
+}
+
+reg install
+install()
+{
+    generic_install DESTDIR
+    doc CHANGES COPYING README* RELEASE-NOTES docs/FAQ docs/FEATURES docs/BUGS \
+      docs/MANUAL docs/RESOURCES docs/TODO docs/TheArtOfHttpScripting \
+      docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS \
+      docs/CONTRIBUTE
+}
+
+reg pack
+pack()
+{
+    generic_pack
+}
+
+reg distclean
+distclean()
+{
+    clean distclean
+}
+
+###################################################
+# No need to look below here
+###################################################
+build_sh $*
diff --git a/curl/makepkg b/curl/makepkg
deleted file mode 100755
index e9648e9..0000000
--- a/curl/makepkg
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-# Create a SSH package from a pre-built sourcedir
-#
-PKGVER=7.10.5
-PKGMK=/usr/bin/pkgmk
-PKGTRANS=/usr/bin/pkgtrans
-STRIP=/usr/ccs/bin/strip
-DESTBASE=/export/home/tgc/buildpkg/curl/build
-BUILDBASE=/export/home/tgc/buildpkg/curl/src/curl-$PKGVER
-PKGBASE=/export/home/tgc/buildpkg/curl
-PROTOTYPE=/export/home/tgc/buildpkg/curl/meta/prototype
-PKGOUT=curl-$PKGVER-sol8-sparcv9-local
-PKGNAME=SBcurl
-
-sed -e "s#%%pkg%%#$PKGNAME#g" \
-    -e "s#%%version%%#$PKGVER#g" $PKGBASE/meta/pkginfo.in > $PKGBASE/meta/pkginfo
-
-echo "Assembling files for curl package"
-# Clean out any old files
-rm -rf $DESTBASE
-
-# Build src
-cd $PKGBASE/src
-bzip2 -dc curl-$PKGVER.tar.bz2| gtar -xf -
-cd curl-$PKGVER
-./configure --prefix=/usr/local --with-ssl --enable-shared=no
-make
-
-# Goto $BUILDBASE and do a make DESTDIR=$DESTBASE install
-cd $BUILDBASE
-make DESTDIR=$DESTBASE install
-
-# strip binaries
-cd $DESTBASE
-find . -type f -perm +x |xargs $STRIP
-
-# Remove libtool lint
-cd $DESTBASE
-find . -type f -name '*.la'|xargs rm -f
-
-echo "Building package"
-# Create a package-instance ready for installation or transfer to a data-stream
-
-# Create prototype file...
-cd $DESTBASE/usr/local
-find . -print|pkgproto > $PKGBASE/meta/prototype.in
-cat $PKGBASE/meta/prototype.in | awk 'BEGIN { print "i pkginfo=../meta/pkginfo"; \
-	} \
-	{ $5="root"; $6="bin"; print; }' > $PKGBASE/meta/prototype
-
-cd $DESTBASE/usr/local
-$PKGMK -r $DESTBASE/usr/local -d $PKGBASE -o -f $PROTOTYPE
-
-echo "Translating package into data-stream format"
-# Transfer the package to data-stream format
-$PKGTRANS -o -s $PKGBASE $PKGBASE/dist/$PKGOUT $PKGNAME
-
-echo "Done. Package is in $PKGBASE/dist/$PKGOUT"
diff --git a/curl/meta/pkgdef b/curl/meta/pkgdef
new file mode 100644
index 0000000..d10860c
--- /dev/null
+++ b/curl/meta/pkgdef
@@ -0,0 +1,40 @@
+[curl]
+pkgname="${pkgprefix}${topdir}"
+name="$topdir - Utility to transfer files with URL syntax"
+pkgcat="application"
+pkgvendor="http://curl.haxx.se"
+pkgdesc="A command line tool for transferring files with URL syntax, supporting FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and FILE."
+pkgver="$pkgver"
+files(-,root,bin)
+$_vdocdir/CHANGES
+$_vdocdir/README
+$_vdocdir/RELEASE-NOTES
+$_vdocdir/COPYING
+$_vdocdir/docs/BUGS
+$_vdocdir/docs/CONTRIBUTE
+$_vdocdir/docs/FAQ
+$_vdocdir/docs/FEATURES
+$_vdocdir/docs/INTERNALS
+$_vdocdir/docs/MANUAL
+$_vdocdir/docs/RESOURCES
+$_vdocdir/docs/TODO
+$_vdocdir/docs/TheArtOfHttpScripting
+$_bindir/curl
+$_mandir/?a?1
+$_libdir/libcurl.so.*
+
+[curl-devel]
+pkgname="${pkgprefix}${topdir}d"
+name="${topdir}-devel - Development support for libcurl"
+pkgcat="application"
+pkgvendor="http://curl.haxx.se"
+pkgdesc="Files needed for developing with libcurl"
+pkgver="$pkgver"
+files(-,root,bin)
+$_bindir/curl-config
+$_includedir
+$_libdir/*.so
+$_libdir/pkgconfig
+$_mandir/?a?3
+$_vdocdir/docs/examples
+
diff --git a/curl/meta/pkginfo.in b/curl/meta/pkginfo.in
deleted file mode 100644
index 6a40ae6..0000000
--- a/curl/meta/pkginfo.in
+++ /dev/null
@@ -1,11 +0,0 @@
-PKG="%%pkg%%"
-NAME="curl"
-ARCH="sparc"
-VERSION="%%version%%"
-CATEGORY="application"
-VENDOR="http://curl.sourceforge.net"
-EMAIL="Tom G. Christenen - tgc@statsbiblioteket.dk"
-PSTAMP="Tom G. Christensen"
-BASEDIR=/usr/local
-CLASSES="none"
-DESC="A client that groks the URLs"
diff --git a/curl/meta/relnotes b/curl/meta/relnotes
new file mode 100644
index 0000000..bd83629
--- /dev/null
+++ b/curl/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
+--------------------