diff --git a/buildpkg.functions b/buildpkg.functions
index 042325b..7788337 100644
--- a/buildpkg.functions
+++ b/buildpkg.functions
@@ -67,7 +67,7 @@ topsrcdir=$topdir-$version # it may be necessary to override this
 
 srcfiles=$buildpkgbase/srcfiles
 
-pkgdirdesig=tgcware # topinstalldir suffix
+pkgdirdesig=dbpware # topinstalldir suffix
 topinstalldir=/usr/$pkgdirdesig
 prefix=$topinstalldir
 metainstalldir=$topinstalldir
@@ -1007,7 +1007,7 @@ generic_install_perl()
 	# but that will break buildpkg since they are processed
 	# later and the names thus change leaving pkgdef broken
         $d =~ /\Q$_\E/ && return
-            for qw|/etc /usr/tgcware/bin /usr/tgcware/share|;
+            for qw|/etc /usr/dbpware/bin /usr/dbpware/share|;
 
         $dirs[@dirs] = $_;
         }
diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris
index dd14907..1dacada 100644
--- a/buildpkg.packaging.solaris
+++ b/buildpkg.packaging.solaris
@@ -46,8 +46,8 @@ pkgvendor="http://change/me/please"
 pkgdesc="mumble mubmle... hmm someone forgot to fill this out!"
 
 # vendor & contact information
-pkgedby="Tom G. Christensen"
-email=swpkg@jupiterrise.com
+pkgedby="Mario Fetka"
+email=mario.fetka@disconnected-by-peer.at
 
 # Set some helper vars that describes arch and OS version
 arch=`uname -p`
@@ -56,7 +56,7 @@ os=sunos`${__uname} -r`
 gnu_os_ver=$(${__uname} -r | ${__sed} -e 's/^5/2/')
 
 # By default, the build_arch is the same as arch, alternatives are sparc64 and
-# x86_64. It should be set to either when building for tgcware64.
+# x86_64. It should be set to either when building for dbpware64.
 build_arch=$arch
 
 # Default pkginfo.in file
diff --git a/buildpkg.tools b/buildpkg.tools
index e790437..5071924 100644
--- a/buildpkg.tools
+++ b/buildpkg.tools
@@ -1,26 +1,26 @@
 # Global tool defintions for buildpkg
 
 # Define tool programs in rpm style __ prefixed namespace
-__bash=/usr/tgcware/bin/bash
+__bash=/usr/dbpware/bin/bash
 __strip=/usr/bin/strip
 __uname=/usr/bin/uname
-__tar=/usr/tgcware/bin/tar # GNU tar v1.14 or better please!
+__tar=/usr/dbpware/bin/tar # GNU tar v1.14 or better please!
 __vtar=/usr/bin/tar # vendor supplied tar
-__bzip2=/usr/tgcware/bin/bzip2
-__gzip=/usr/tgcware/bin/gzip
-__xz=/usr/tgcware/bin/xz
-__lzip=/usr/tgcware/bin/lzip
-__patch=/usr/tgcware/bin/patch # GNU patch 2.5 or better please!
+__bzip2=/usr/dbpware/bin/bzip2
+__gzip=/usr/dbpware/bin/gzip
+__xz=/usr/dbpware/bin/xz
+__lzip=/usr/dbpware/bin/lzip
+__patch=/usr/dbpware/bin/patch # GNU patch 2.5 or better please!
 __rm=/usr/bin/rm
 __rmdir=/usr/bin/rmdir
 __mkdir=/usr/bin/mkdir
-__make=/usr/tgcware/bin/make # GNU make 3.80 or better please!
+__make=/usr/dbpware/bin/make # GNU make 3.80 or better please!
 __find=/usr/bin/find # vendor supplied find, GNU find will require changes to the script
 __xargs=/usr/bin/xargs
 __cat=/usr/bin/cat
 __awk=/usr/bin/nawk # This must be nawk or GNU awk - plain /usr/bin/awk will *not* work
 __sed=/usr/bin/sed
-__gsed=/usr/tgcware/bin/sed
+__gsed=/usr/dbpware/bin/sed
 __sort=/usr/bin/sort
 __cut=/usr/bin/cut
 __ls=/usr/bin/ls
@@ -28,11 +28,11 @@ __expr=/usr/bin/expr
 __mv=/usr/bin/mv
 __mkdir=/usr/bin/mkdir
 __cp=/usr/bin/cp
-__gcp=/usr/tgcware/bin/cp
+__gcp=/usr/dbpware/bin/cp
 __tee=/bin/tee
 __grep=/bin/grep
 __egrep=/bin/egrep
-__ggrep=/usr/tgcware/bin/grep # GNU grep
+__ggrep=/usr/dbpware/bin/grep # GNU grep
 __uniq=/bin/uniq
 __basename=/bin/basename
 __dirname=/bin/dirname
@@ -40,17 +40,17 @@ __tr=/bin/tr
 __file=/usr/bin/file # Used by do_strip()
 __ln=/usr/bin/ln
 __ln_s="/usr/bin/ln -s"
-__install=/usr/tgcware/bin/install # BSD compatible install - usually GNU install
+__install=/usr/dbpware/bin/install # BSD compatible install - usually GNU install
 __compress=/usr/bsd/compress
 __pack=/usr/bin/pack
-__sha1sum=/usr/tgcware/bin/sha1sum
-__unzip=/usr/tgcware/bin/unzip
+__sha1sum=/usr/dbpware/bin/sha1sum
+__unzip=/usr/dbpware/bin/unzip
 __head=/usr/bin/head # Must support -n
-__perl=/usr/tgcware/bin/perl
-__readlink=/usr/tgcware/bin/readlink
+__perl=/usr/dbpware/bin/perl
+__readlink=/usr/dbpware/bin/readlink
 __ldd=/usr/bin/ldd
-__curl=/usr/tgcware/bin/curl
+__curl=/usr/dbpware/bin/curl
 
 # Groff stuff for manpages
-__nroff=/usr/tgcware/bin/nroff
+__nroff=/usr/dbpware/bin/nroff
 NROFFOPTS="-c -mandoc -Tascii -t"