diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris
index 7decf93..7ffa029 100644
--- a/buildpkg.packaging.solaris
+++ b/buildpkg.packaging.solaris
@@ -25,14 +25,20 @@ pkgdesc="mumble mubmle... hmm someone forgot to fill this out!"
 cpu=sparcv9
 os=sol`$UNAME -r`
 
+# Default pkginfo.in file
+pkginfo=$buildpkgbase/scripts/pkginfo.in
+
+# Variables that control functionality
+usedepend=1 # default to looking for a depend file in $metadir
+
+# Host specific configuration
+[ -r $buildpkgbase/scripts/config.`hostname`.solaris ] && . $buildpkgbase/scripts/config.`hostname`.solaris
+
 # Distfiles should be named like this
 # <name>-<version>-<pkgver>.sb-<os>-<cpu>-<pkgdirdesig>
 # ie: libmad-0.14.2b-1.sb-sol5.8-sparcv9-local
 distfile=$topdir-$version-$pkgver.sb-$os-$cpu-$pkgdirdesig
 
-# Variables that control functionality
-usedepend=1 # default to looking for a depend file in $metadir
-
 ##################################################### 
 # "external" functions
 #####################################################
@@ -64,7 +70,7 @@ pack_info()
 	-e "s#%%name%%#$name#g" \
 	-e "s#%%topinstalldir%%#$topinstalldir#g" \
 	-e "s#%%pkgdesc%%#$pkgdesc#g" \
-	$metadir/pkginfo.in > $metadir/pkginfo
+	$pkginfo > $metadir/pkginfo
 }
 
 # prototype(): Create a prototype file for pkgmk
diff --git a/pkginfo.in b/pkginfo.in
index 95b0128..4bcf29a 100644
--- a/pkginfo.in
+++ b/pkginfo.in
@@ -4,7 +4,7 @@ ARCH="sparc"
 VERSION="%%version%%"
 CATEGORY="%%pkgcat%%"
 VENDOR="%%pkgvendor%%"
-EMAIL="Tom G. Christenen - tgc@statsbiblioteket.dk"
+EMAIL="Tom G. Christensen - tgc@statsbiblioteket.dk"
 PSTAMP="%%pkgver%%"
 BASEDIR="%%topinstalldir%%"
 CLASSES="none"