diff --git a/a/grub2/grub2.SlackBuild b/a/grub2/grub2.SlackBuild
index 9263966d..b03d3e0d 100755
--- a/a/grub2/grub2.SlackBuild
+++ b/a/grub2/grub2.SlackBuild
@@ -25,11 +25,12 @@
 PKGNAM=grub
 VERSION=1.97.2
 ARCH=${ARCH:-x86_64}
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
+PKG=$TMP/pkg-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
@@ -126,4 +127,4 @@ grub:
 EOF
 
 cd $PKG
-makepkg -l y -c n $TMP/grub-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/grub-$VERSION-$ARCH-$BUILD$PACKAGER.txz
diff --git a/a/i8kutils/i8kutils.SlackBuild b/a/i8kutils/i8kutils.SlackBuild
index b80aea1a..bb43fe39 100755
--- a/a/i8kutils/i8kutils.SlackBuild
+++ b/a/i8kutils/i8kutils.SlackBuild
@@ -5,7 +5,7 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=i8kutils
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=1.33
 
@@ -14,7 +14,8 @@ EXT=tar.gz
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README* TODO examples patches"
 
 ARCH=$(uname -m)
-BUILD=2cyco
+BUILD=2
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -133,4 +134,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/ap/chrpath/chrpath.SlackBuild b/ap/chrpath/chrpath.SlackBuild
index 5470b00d..22356304 100755
--- a/ap/chrpath/chrpath.SlackBuild
+++ b/ap/chrpath/chrpath.SlackBuild
@@ -41,7 +41,7 @@ if [ ! -d ${TMP} ]; then
 fi
 
 NAME=chrpath
-PKG=${PKG:-${TMP}/package-${NAME}}
+PKG=${PKG:-${TMP}/pkg-${NAME}}
 
 VERSION=${VERSION:-0.13}
 if [ "${SB_NATIVE}" = "YES" ] ;then
diff --git a/ap/offlineimap/offlineimap.SlackBuild b/ap/offlineimap/offlineimap.SlackBuild
index 93b6e0f2..e8eb3743 100755
--- a/ap/offlineimap/offlineimap.SlackBuild
+++ b/ap/offlineimap/offlineimap.SlackBuild
@@ -36,7 +36,7 @@ PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1cyco}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
-PKG=${PKG:=$TMP/package-$PKG_NAME}
+PKG=${PKG:=$TMP/pkg-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
diff --git a/ap/sdcv/sdcv.SlackBuild b/ap/sdcv/sdcv.SlackBuild
index 5515f70b..cff2d01a 100755
--- a/ap/sdcv/sdcv.SlackBuild
+++ b/ap/sdcv/sdcv.SlackBuild
@@ -6,10 +6,11 @@ CWD=$(pwd)
 PRGNAM=sdcv
 ARCH=$(uname -m)
 VERSION=svn$(date +%Y.%m.%d_%H.%M)
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 TMP=/tmp
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 GZBZ2="bz2"
 
@@ -73,4 +74,4 @@ EOF
 
 chown -R root:root $PKG
 
-makepkg -c n -l y $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz || exit $ERROR_MKPKG
+makepkg -c n -l y $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD$PACKAGER.txz || exit $ERROR_MKPKG
diff --git a/cross-compiling/cross-binutils/cross-binutils.SlackBuild b/cross-compiling/cross-binutils/cross-binutils.SlackBuild
index a3c9efe3..930a3dde 100755
--- a/cross-compiling/cross-binutils/cross-binutils.SlackBuild
+++ b/cross-compiling/cross-binutils/cross-binutils.SlackBuild
@@ -33,7 +33,7 @@ VERSION=${SRCVER}_$CROSS
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/$TAG}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
diff --git a/cross-compiling/cross-gcc/cross-gcc.SlackBuild b/cross-compiling/cross-gcc/cross-gcc.SlackBuild
index 016e9911..7818803c 100755
--- a/cross-compiling/cross-gcc/cross-gcc.SlackBuild
+++ b/cross-compiling/cross-gcc/cross-gcc.SlackBuild
@@ -34,7 +34,7 @@ VERSION=${SRCVER}_$CROSS
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/$TAG}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 GCC_TMP=$TMP/gcc-$(mcookie)
diff --git a/d/ctags/ctags.SlackBuild b/d/ctags/ctags.SlackBuild
index da4e07e9..23d8bc0d 100755
--- a/d/ctags/ctags.SlackBuild
+++ b/d/ctags/ctags.SlackBuild
@@ -25,7 +25,7 @@
 set -e
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=${PKG:-$TMP/package-ctags}
+PKG=${PKG:-$TMP/pkg-ctags}
 OUT=${OUT:-$TMP/build}
 
 VERSION=${VERSION:-5.8}
diff --git a/d/node.js/node.js.SlackBuild b/d/node.js/node.js.SlackBuild
index 734ea2f8..02ec3332 100755
--- a/d/node.js/node.js.SlackBuild
+++ b/d/node.js/node.js.SlackBuild
@@ -13,7 +13,7 @@ PREFIX=/usr
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
diff --git a/d/phantomjs/phantomjs.SlackBuild b/d/phantomjs/phantomjs.SlackBuild
index d75626e2..b317d9cb 100755
--- a/d/phantomjs/phantomjs.SlackBuild
+++ b/d/phantomjs/phantomjs.SlackBuild
@@ -3,7 +3,7 @@
 CWD=$(pwd)
 PRGNAM=$(basename $CWD)
 TMP=${TMP:-/tmp/cyco}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 VERSION=${VERSION:-$(date +%Y.%m.%d_%H.%M)}
diff --git a/d/redis/redis.SlackBuild b/d/redis/redis.SlackBuild
index 08524df8..16ea951c 100755
--- a/d/redis/redis.SlackBuild
+++ b/d/redis/redis.SlackBuild
@@ -3,7 +3,7 @@
 CWD=$(pwd)
 PRGNAM=$(basename $CWD)
 TMP=${TMP:-/tmp/cyco}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 VERSION=${VERSION:-$(date +%Y.%m.%d_%H.%M)}
diff --git a/e/emacs/emacs.SlackBuild b/e/emacs/emacs.SlackBuild
index 95b800a7..27c5be07 100755
--- a/e/emacs/emacs.SlackBuild
+++ b/e/emacs/emacs.SlackBuild
@@ -49,7 +49,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 REPOSITORIES=/home/cycojesus/projets/packages/repositories/
 
 rm -rf $PKG
diff --git a/e/ruby-misc-el/ruby-misc-el.SlackBuild b/e/ruby-misc-el/ruby-misc-el.SlackBuild
index a6c63cc9..c616d312 100755
--- a/e/ruby-misc-el/ruby-misc-el.SlackBuild
+++ b/e/ruby-misc-el/ruby-misc-el.SlackBuild
@@ -7,7 +7,7 @@ ARCH=emacs
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-ruby-misc-el
+PKG=$TMP/pkg-ruby-misc-el
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
diff --git a/fonts/AnonymousPro/AnonymousPro.SlackBuild b/fonts/AnonymousPro/AnonymousPro.SlackBuild
index 11e8a2bb..1fd64ab2 100755
--- a/fonts/AnonymousPro/AnonymousPro.SlackBuild
+++ b/fonts/AnonymousPro/AnonymousPro.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/Bodoni-SvtyTwo-OS-ITC-TT/Bodoni-SvtyTwo-OS-ITC-TT.SlackBuild b/fonts/Bodoni-SvtyTwo-OS-ITC-TT/Bodoni-SvtyTwo-OS-ITC-TT.SlackBuild
index 35518c3b..9bd3f0d2 100755
--- a/fonts/Bodoni-SvtyTwo-OS-ITC-TT/Bodoni-SvtyTwo-OS-ITC-TT.SlackBuild
+++ b/fonts/Bodoni-SvtyTwo-OS-ITC-TT/Bodoni-SvtyTwo-OS-ITC-TT.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 TMP=/tmp
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/fonts/CentSchBook-Mono/CentSchBook-Mono.SlackBuild b/fonts/CentSchBook-Mono/CentSchBook-Mono.SlackBuild
index 85573e40..592cecb3 100755
--- a/fonts/CentSchBook-Mono/CentSchBook-Mono.SlackBuild
+++ b/fonts/CentSchBook-Mono/CentSchBook-Mono.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 TMP=/tmp
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/fonts/DroidSansMonoDotted/DroidSansMonoDotted.SlackBuild b/fonts/DroidSansMonoDotted/DroidSansMonoDotted.SlackBuild
index f3400bec..83336e1a 100755
--- a/fonts/DroidSansMonoDotted/DroidSansMonoDotted.SlackBuild
+++ b/fonts/DroidSansMonoDotted/DroidSansMonoDotted.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/DroidSansMonoSlashed/DroidSansMonoSlashed.SlackBuild b/fonts/DroidSansMonoSlashed/DroidSansMonoSlashed.SlackBuild
index 3813349c..6a84bb03 100755
--- a/fonts/DroidSansMonoSlashed/DroidSansMonoSlashed.SlackBuild
+++ b/fonts/DroidSansMonoSlashed/DroidSansMonoSlashed.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/EnvyCodeR/EnvyCodeR.SlackBuild b/fonts/EnvyCodeR/EnvyCodeR.SlackBuild
index 100e4b7e..5bcc1ca6 100755
--- a/fonts/EnvyCodeR/EnvyCodeR.SlackBuild
+++ b/fonts/EnvyCodeR/EnvyCodeR.SlackBuild
@@ -10,7 +10,7 @@ CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/Hoefler-Text/Hoefler-Text.SlackBuild b/fonts/Hoefler-Text/Hoefler-Text.SlackBuild
index 156d8e07..e481d1bb 100755
--- a/fonts/Hoefler-Text/Hoefler-Text.SlackBuild
+++ b/fonts/Hoefler-Text/Hoefler-Text.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 TMP=/tmp
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/fonts/MarainScript/MarainScript.SlackBuild b/fonts/MarainScript/MarainScript.SlackBuild
index 288ff635..22feaef4 100755
--- a/fonts/MarainScript/MarainScript.SlackBuild
+++ b/fonts/MarainScript/MarainScript.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/cantarell-fonts/cantarell-fonts.SlackBuild b/fonts/cantarell-fonts/cantarell-fonts.SlackBuild
index c6026bfb..f1ae00af 100755
--- a/fonts/cantarell-fonts/cantarell-fonts.SlackBuild
+++ b/fonts/cantarell-fonts/cantarell-fonts.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/exljbris/exljbris.SlackBuild b/fonts/exljbris/exljbris.SlackBuild
index ab857b52..23047827 100755
--- a/fonts/exljbris/exljbris.SlackBuild
+++ b/fonts/exljbris/exljbris.SlackBuild
@@ -9,7 +9,7 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-cyco}
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 TMP=/tmp
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/fonts/fontsquirrel.com-Monospaced/fontsquirrel.com-Monospaced.SlackBuild b/fonts/fontsquirrel.com-Monospaced/fontsquirrel.com-Monospaced.SlackBuild
index 7e82e8de..e64ef52d 100755
--- a/fonts/fontsquirrel.com-Monospaced/fontsquirrel.com-Monospaced.SlackBuild
+++ b/fonts/fontsquirrel.com-Monospaced/fontsquirrel.com-Monospaced.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 TMP=/tmp
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/fonts/googlefontdirectory/googlefontdirectory.SlackBuild b/fonts/googlefontdirectory/googlefontdirectory.SlackBuild
index b3455c69..604a32fa 100755
--- a/fonts/googlefontdirectory/googlefontdirectory.SlackBuild
+++ b/fonts/googlefontdirectory/googlefontdirectory.SlackBuild
@@ -9,7 +9,7 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-cyco}
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 TMP=/tmp
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/fonts/helvetica/helvetica.SlackBuild b/fonts/helvetica/helvetica.SlackBuild
index 3d7a0363..efcaf052 100755
--- a/fonts/helvetica/helvetica.SlackBuild
+++ b/fonts/helvetica/helvetica.SlackBuild
@@ -9,7 +9,7 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-cyco}
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/inconsolata/inconsolata.SlackBuild b/fonts/inconsolata/inconsolata.SlackBuild
index b6effb37..12c35d1f 100755
--- a/fonts/inconsolata/inconsolata.SlackBuild
+++ b/fonts/inconsolata/inconsolata.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/mensch/mensch.SlackBuild b/fonts/mensch/mensch.SlackBuild
index 60d386e8..97e02308 100755
--- a/fonts/mensch/mensch.SlackBuild
+++ b/fonts/mensch/mensch.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/otf-District-Thin/otf-District-Thin.SlackBuild b/fonts/otf-District-Thin/otf-District-Thin.SlackBuild
index 55f5116e..531425c7 100755
--- a/fonts/otf-District-Thin/otf-District-Thin.SlackBuild
+++ b/fonts/otf-District-Thin/otf-District-Thin.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/ttf-CharisSIL/ttf-CharisSIL.SlackBuild b/fonts/ttf-CharisSIL/ttf-CharisSIL.SlackBuild
index 5717aa9a..c7ab109a 100755
--- a/fonts/ttf-CharisSIL/ttf-CharisSIL.SlackBuild
+++ b/fonts/ttf-CharisSIL/ttf-CharisSIL.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/ttf-DoulosSIL/ttf-DoulosSIL.SlackBuild b/fonts/ttf-DoulosSIL/ttf-DoulosSIL.SlackBuild
index 343e0743..1b261b09 100755
--- a/fonts/ttf-DoulosSIL/ttf-DoulosSIL.SlackBuild
+++ b/fonts/ttf-DoulosSIL/ttf-DoulosSIL.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/ttf-MgOpen/ttf-MgOpen.SlackBuild b/fonts/ttf-MgOpen/ttf-MgOpen.SlackBuild
index c474c958..0d2fde6b 100755
--- a/fonts/ttf-MgOpen/ttf-MgOpen.SlackBuild
+++ b/fonts/ttf-MgOpen/ttf-MgOpen.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/ttf-gentium-basic/ttf-gentium-basic.SlackBuild b/fonts/ttf-gentium-basic/ttf-gentium-basic.SlackBuild
index 42d71835..17962fdf 100755
--- a/fonts/ttf-gentium-basic/ttf-gentium-basic.SlackBuild
+++ b/fonts/ttf-gentium-basic/ttf-gentium-basic.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/ttf-gentium/ttf-gentium.SlackBuild b/fonts/ttf-gentium/ttf-gentium.SlackBuild
index a63a72f6..544830f9 100755
--- a/fonts/ttf-gentium/ttf-gentium.SlackBuild
+++ b/fonts/ttf-gentium/ttf-gentium.SlackBuild
@@ -9,7 +9,7 @@ TAG=${TAG:-cyco}
 CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/fonts/ubuntu-font-family/ubuntu-font-family.SlackBuild b/fonts/ubuntu-font-family/ubuntu-font-family.SlackBuild
index 38dc6e91..5d2cf113 100755
--- a/fonts/ubuntu-font-family/ubuntu-font-family.SlackBuild
+++ b/fonts/ubuntu-font-family/ubuntu-font-family.SlackBuild
@@ -10,7 +10,7 @@ CWD=$(pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Create working directories:
diff --git a/l/arabica/arabica.SlackBuild b/l/arabica/arabica.SlackBuild
index 9b9e06bc..2611275a 100755
--- a/l/arabica/arabica.SlackBuild
+++ b/l/arabica/arabica.SlackBuild
@@ -5,14 +5,15 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=$(basename $CWD)
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=2010-November
 
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=$(uname -m)
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -84,4 +85,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/l/gdk-pixbuf/gdk-pixbuf.SlackBuild b/l/gdk-pixbuf/gdk-pixbuf.SlackBuild
index e34addef..19a69f1c 100755
--- a/l/gdk-pixbuf/gdk-pixbuf.SlackBuild
+++ b/l/gdk-pixbuf/gdk-pixbuf.SlackBuild
@@ -5,7 +5,7 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=$(basename $CWD)
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=2.22.0
 
@@ -14,7 +14,8 @@ EXT=tar.bz2
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=x86_64
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -87,4 +88,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/l/libconfig/libconfig.SlackBuild b/l/libconfig/libconfig.SlackBuild
index da767a07..6e96c627 100755
--- a/l/libconfig/libconfig.SlackBuild
+++ b/l/libconfig/libconfig.SlackBuild
@@ -5,14 +5,15 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=$(basename $CWD)
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=1.4.3
 
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=$(uname -m)
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -91,4 +92,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/l/libev/libev.SlackBuild b/l/libev/libev.SlackBuild
index c74c5a41..f70cbf6c 100755
--- a/l/libev/libev.SlackBuild
+++ b/l/libev/libev.SlackBuild
@@ -5,7 +5,7 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=libev
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=4.03
 
@@ -14,7 +14,8 @@ EXT=tar.gz
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=$(uname -m)
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -80,4 +81,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/l/libfakekey/libfakekey.SlackBuild b/l/libfakekey/libfakekey.SlackBuild
index bf590359..d284c2c5 100755
--- a/l/libfakekey/libfakekey.SlackBuild
+++ b/l/libfakekey/libfakekey.SlackBuild
@@ -5,14 +5,15 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=libfakekey
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=0.1
 
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=$(uname -m)
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -83,4 +84,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/l/libxdg-basedir/libxdg-basedir.SlackBuild b/l/libxdg-basedir/libxdg-basedir.SlackBuild
index d9a30dd2..a3a42a17 100755
--- a/l/libxdg-basedir/libxdg-basedir.SlackBuild
+++ b/l/libxdg-basedir/libxdg-basedir.SlackBuild
@@ -5,7 +5,7 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=libxdg-basedir
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=1.0.0
 
@@ -14,7 +14,8 @@ EXT=tar.gz
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=$(uname -m)
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -79,4 +80,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/l/stfl/stfl.SlackBuild b/l/stfl/stfl.SlackBuild
index 77a7e5c0..d85816a9 100755
--- a/l/stfl/stfl.SlackBuild
+++ b/l/stfl/stfl.SlackBuild
@@ -12,7 +12,7 @@ TAG=${TAG:-cyco}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
diff --git a/n/ec2-ami-tools/ec2-ami-tools.SlackBuild b/n/ec2-ami-tools/ec2-ami-tools.SlackBuild
index c4301e44..e16038cd 100755
--- a/n/ec2-ami-tools/ec2-ami-tools.SlackBuild
+++ b/n/ec2-ami-tools/ec2-ami-tools.SlackBuild
@@ -3,7 +3,7 @@
 CWD=$(pwd)
 PRGNAM=$(basename $CWD)
 TMP=${TMP:-/tmp/cyco}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 VERSION=${VERSION:-PLACEHOLDER}
diff --git a/n/ec2-api-tools/ec2-api-tools.SlackBuild b/n/ec2-api-tools/ec2-api-tools.SlackBuild
index 3f4cb5d6..17647279 100755
--- a/n/ec2-api-tools/ec2-api-tools.SlackBuild
+++ b/n/ec2-api-tools/ec2-api-tools.SlackBuild
@@ -3,7 +3,7 @@
 CWD=$(pwd)
 PRGNAM=$(basename $CWD)
 TMP=${TMP:-/tmp/cyco}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 VERSION=${VERSION:-PLACEHOLDER}
diff --git a/n/mongrel2/mongrel2.SlackBuild b/n/mongrel2/mongrel2.SlackBuild
index 9c5cf8d8..3f93e36c 100755
--- a/n/mongrel2/mongrel2.SlackBuild
+++ b/n/mongrel2/mongrel2.SlackBuild
@@ -3,7 +3,7 @@
 CWD=$(pwd)
 PRGNAM=$(basename $CWD)
 TMP=${TMP:-/tmp/cyco}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 VERSION=${VERSION:-$(echo $PRGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
diff --git a/n/newsbeuter/newsbeuter.SlackBuild b/n/newsbeuter/newsbeuter.SlackBuild
index 03dcf278..9abf00c7 100755
--- a/n/newsbeuter/newsbeuter.SlackBuild
+++ b/n/newsbeuter/newsbeuter.SlackBuild
@@ -12,7 +12,7 @@ TAG=${TAG:-cyco}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
diff --git a/n/varnish/varnish.SlackBuild b/n/varnish/varnish.SlackBuild
index f21d2eb6..4158b243 100755
--- a/n/varnish/varnish.SlackBuild
+++ b/n/varnish/varnish.SlackBuild
@@ -32,7 +32,7 @@ TAG=${TAG:-cyco}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/cyco}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
diff --git a/n/w3m/w3m.SlackBuild b/n/w3m/w3m.SlackBuild
index 8cb9c5b5..071c0b86 100755
--- a/n/w3m/w3m.SlackBuild
+++ b/n/w3m/w3m.SlackBuild
@@ -12,7 +12,7 @@ TAG=${TAG:-cyco}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
diff --git a/x/libdrm/libdrm.SlackBuild b/x/libdrm/libdrm.SlackBuild
index 8d465230..964f998e 100755
--- a/x/libdrm/libdrm.SlackBuild
+++ b/x/libdrm/libdrm.SlackBuild
@@ -30,7 +30,7 @@ BUILD=${BUILD:-1cyco}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
+PKG=$TMP/pkg-${PKGNAM}
 
 REPOSITORIES=/home/cycojesus/projets/packages/repositories
 
@@ -145,6 +145,6 @@ libdrm:
 libdrm:
 EOF
 
-cd $TMP/package-${PKGNAM}
+cd $TMP/pkg-${PKGNAM}
 /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/x/xf86-input-evtouch/xf86-input-evtouch.SlackBuild b/x/xf86-input-evtouch/xf86-input-evtouch.SlackBuild
index fa432d8e..916aaad3 100755
--- a/x/xf86-input-evtouch/xf86-input-evtouch.SlackBuild
+++ b/x/xf86-input-evtouch/xf86-input-evtouch.SlackBuild
@@ -5,7 +5,7 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=$(basename $CWD)
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=0.8.8
 
@@ -14,7 +14,8 @@ EXT=tar.xz
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=$(uname -m)
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -94,4 +95,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/x/xf86-input-plpevtch/xf86-input-plpevtch.SlackBuild b/x/xf86-input-plpevtch/xf86-input-plpevtch.SlackBuild
index fc5fa251..dfa7c0ef 100755
--- a/x/xf86-input-plpevtch/xf86-input-plpevtch.SlackBuild
+++ b/x/xf86-input-plpevtch/xf86-input-plpevtch.SlackBuild
@@ -5,7 +5,7 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=$(basename $CWD)
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=0.4.0
 
@@ -14,7 +14,8 @@ EXT=tar.xz
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=$(uname -m)
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -87,4 +88,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/xap/OmegaT/OmegaT.SlackBuild b/xap/OmegaT/OmegaT.SlackBuild
index 2bd77ca4..e4c11860 100755
--- a/xap/OmegaT/OmegaT.SlackBuild
+++ b/xap/OmegaT/OmegaT.SlackBuild
@@ -11,7 +11,7 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-cyco}
 
 TMP=${TMP:-/tmp/$TAG}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 rm -rf $PKG
diff --git a/xap/chromium/chromium.SlackBuild b/xap/chromium/chromium.SlackBuild
index 831f93f7..a192e6b5 100755
--- a/xap/chromium/chromium.SlackBuild
+++ b/xap/chromium/chromium.SlackBuild
@@ -33,7 +33,7 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-cyco}
 
 TMP=${TMP:-/tmp/$TAG}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Just in case:
diff --git a/xap/comix/comix.SlackBuild b/xap/comix/comix.SlackBuild
index 3d6d97f2..e1a67d74 100755
--- a/xap/comix/comix.SlackBuild
+++ b/xap/comix/comix.SlackBuild
@@ -10,7 +10,7 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 rm -rf $PKG
diff --git a/xap/gimp-git/gimp.SlackBuild b/xap/gimp-git/gimp.SlackBuild
index f59745a6..6e9c3c12 100755
--- a/xap/gimp-git/gimp.SlackBuild
+++ b/xap/gimp-git/gimp.SlackBuild
@@ -29,7 +29,7 @@ NUMJOBS=${NUMJOBS:-" -j3 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-gimp
+PKG=$TMP/pkg-gimp
 REPOSITORIES=/home/cycojesus/projets/packages/repositories
 
 rm -rf $PKG
diff --git a/xap/gnash/gnash.SlackBuild b/xap/gnash/gnash.SlackBuild
index 46e0b98e..01a3a23e 100755
--- a/xap/gnash/gnash.SlackBuild
+++ b/xap/gnash/gnash.SlackBuild
@@ -4,7 +4,7 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 
 PRGNAM=$(basename $CWD)
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=git$(date +%Y.%m.%d_%H.%M)
 ARCH=${ARCH:-$(uname -m)}
diff --git a/xap/hptalx/hptalx.SlackBuild b/xap/hptalx/hptalx.SlackBuild
index 5728a5ba..272311b3 100755
--- a/xap/hptalx/hptalx.SlackBuild
+++ b/xap/hptalx/hptalx.SlackBuild
@@ -5,7 +5,7 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=hptalx
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=1.3.1a
 
@@ -14,7 +14,8 @@ EXT=tar.bz2
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=x86_64
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -79,4 +80,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/xap/matchbox-keyboard/matchbox-keyboard.SlackBuild b/xap/matchbox-keyboard/matchbox-keyboard.SlackBuild
index df4a31d6..91ee39f0 100755
--- a/xap/matchbox-keyboard/matchbox-keyboard.SlackBuild
+++ b/xap/matchbox-keyboard/matchbox-keyboard.SlackBuild
@@ -5,14 +5,15 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=matchbox-keyboard
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=0.1
 
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=$(uname -m)
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -85,4 +86,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/xap/mozilla-firefox-trunk/mozilla-firefox.SlackBuild b/xap/mozilla-firefox-trunk/mozilla-firefox.SlackBuild
index 18873f22..948b6c19 100755
--- a/xap/mozilla-firefox-trunk/mozilla-firefox.SlackBuild
+++ b/xap/mozilla-firefox-trunk/mozilla-firefox.SlackBuild
@@ -4,7 +4,7 @@ KEEP_TAR=${KEEP_TAR:-"NO"}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-mozilla-firefox
+PKG=$TMP/pkg-mozilla-firefox
 
 # This is not a source build script.  Rather, it builds a Slackware
 # package from the official binary tarball available from mozilla.org.
diff --git a/xap/textroom/textroom.SlackBuild b/xap/textroom/textroom.SlackBuild
index 1d724a44..3148132b 100755
--- a/xap/textroom/textroom.SlackBuild
+++ b/xap/textroom/textroom.SlackBuild
@@ -5,7 +5,7 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=textroom
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=0.6.5
 
@@ -14,7 +14,8 @@ EXT=tar.gz
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=x86_64
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -82,4 +83,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/y/gnugo/gnugo.SlackBuild b/y/gnugo/gnugo.SlackBuild
index 4417e5f6..4898e034 100755
--- a/y/gnugo/gnugo.SlackBuild
+++ b/y/gnugo/gnugo.SlackBuild
@@ -5,7 +5,7 @@ TMP=/tmp
 CWD=$(pwd)
 
 PRGNAM=gnugo
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 
 VERSION=3.8
 
@@ -14,7 +14,8 @@ EXT=tar.gz
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
 
 ARCH=x86_64
-BUILD=1cyco
+BUILD=1
+PACKAGER=cyco
 
 PREFIX=/usr
 
@@ -88,4 +89,4 @@ EOF
 
 # empaquetage
 cd $PKG
-makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/$PRGNAM-$(echo $VERSION | sed 's/-//g')-$ARCH-$BUILD$PACKAGER.txz
diff --git a/y/xscrabble/xscrabble.SlackBuild b/y/xscrabble/xscrabble.SlackBuild
index 7d0efdae..2d7ee8f7 100755
--- a/y/xscrabble/xscrabble.SlackBuild
+++ b/y/xscrabble/xscrabble.SlackBuild
@@ -15,7 +15,7 @@ DEFAULT_LANG=${DEFAULT_LANG:-fr}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 rm -fr $TMP/$PRGNAM $PKG $TMP/$PRGNAM-$VERSION