diff --git a/packages/app-emulation/qemu/qemu.exlib b/packages/app-emulation/qemu/qemu.exlib
index 94dd20f..583a0e4 100644
--- a/packages/app-emulation/qemu/qemu.exlib
+++ b/packages/app-emulation/qemu/qemu.exlib
@@ -9,7 +9,7 @@ DESCRIPTION="
     machine on a different machine. It claims to achieve good performances
     because of dynamic translation.'
 "
-HOMEPAGE="http://bellard.org/$PN"
+HOMEPAGE="http://bellard.org/${PN}"
 
 LICENCES="GPL-2"
 MYOPTIONS="
@@ -39,9 +39,9 @@ DEPENDENCIES="
 
 REMOTE_IDS="freshmeat:qemu"
 
-UPSTREAM_CHANGELOG="$HOMEPAGE/changelog.html"
-UPSTREAM_DOCUMENTATION="$HOMEPAGE/user-doc.html"
-UPSTREAM_RELEASE_NOTES="$HOMEPAGE/index.html"
+UPSTREAM_CHANGELOG="${HOMEPAGE}/changelog.html"
+UPSTREAM_DOCUMENTATION="${HOMEPAGE}/user-doc.html"
+UPSTREAM_RELEASE_NOTES="${HOMEPAGE}/index.html"
 
 # TODO: configure creates automagic dependency and static linkage with SDL
 
@@ -68,11 +68,11 @@ qemu_src_configure ()
         --prefix=/usr \
         --host-cc="${BUILD_CC}" \
         --cc="${CC}" \
-        --extra-cflags="$CFLAGS" \
-        --extra-ldflags="$LDFLAGS" \
+        --extra-cflags="${CFLAGS}" \
+        --extra-ldflags="${LDFLAGS}" \
         --disable-strip \
         --audio-drv-list="$(echo ${audio_drv[@]} | tr ' ' ',')" \
-        ${myconf[@]} \
+        "${myconf[@]}" \
         ${EXTRA_ECONF} \
         $@
 }
diff --git a/packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0 b/packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0
index a9551f5..c02fe50 100644
--- a/packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0
+++ b/packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0
@@ -8,8 +8,8 @@ DESCRIPTION="A text file conversion utility that converts ASCII files between
 MSDOS (or Windows) format, which traditionally have CR/LF (carriage
 return/line feed) pairs as their new line delimiters, and the Unix format,
 which usually have LFs (line feeds) to terminate each line."
-HOMEPAGE="http://www.thefreecountry.com/$PN/index.shtml"
-DOWNLOADS="http://$PN.sourceforge.net/download/$PNV.tar.gz"
+HOMEPAGE="http://www.thefreecountry.com/${PN}/index.shtml"
+DOWNLOADS="http://${PN}.sourceforge.net/download/${PNV}.tar.gz"
 
 LICENCES="GPL-2"
 SLOT="0"
@@ -18,7 +18,7 @@ MYOPTIONS=""
 
 DEPENDENCIES=""
 
-WORK="$WORKBASE/$PN/src"
+WORK="${WORKBASE}/${PN}/src"
 
 src_prepare() {
     default
@@ -26,8 +26,8 @@ src_prepare() {
     edo sed \
         -e "/CC =/s:gcc:${CC}:" \
         -e "/LD =/s:gcc:${CC}:" \
-        -e "/CFLAGS =/s:\$(CDEBUG):$CFLAGS:" \
-        -e "/LDFLAGS =/s:\$(LDEBUG):$LDFLAGS:" \
+        -e "/CFLAGS =/s:\$(CDEBUG):${CFLAGS}:" \
+        -e "/LDFLAGS =/s:\$(LDEBUG):${LDFLAGS}:" \
         -i Makefile
 }
 
@@ -36,8 +36,8 @@ src_install() {
     doman fromdos.1
 
     for link in todos dos2unix unix2dos ; do
-        dosym fromdos /usr/bin/$link
-        dosym fromdos.1 /usr/share/man/man1/$link.1
+        dosym fromdos /usr/bin/${link}
+        dosym fromdos.1 /usr/share/man/man1/${link}.1
     done
 }
 
diff --git a/packages/dev-libs/libconfig/libconfig-1.3.2.exheres-0 b/packages/dev-libs/libconfig/libconfig-1.3.2.exheres-0
index 8c1b4d6..ecdd77a 100644
--- a/packages/dev-libs/libconfig/libconfig-1.3.2.exheres-0
+++ b/packages/dev-libs/libconfig/libconfig-1.3.2.exheres-0
@@ -6,15 +6,15 @@ DESCRIPTION="
 A simple and small library (38K - 66K) POSIX and Windows 2000 or later compliant configuration
 file parser.
 "
-HOMEPAGE="http://www.hyperrealm.com/$PN"
-DOWNLOADS="$HOMEPAGE/$PNV.tar.gz"
+HOMEPAGE="http://www.hyperrealm.com/${PN}"
+DOWNLOADS="${HOMEPAGE}/${PNV}.tar.gz"
 
 LICENCES="LGPL-2.1"
 SLOT="0"
 PLATFORMS="~amd64 ~x86"
 MYOPTIONS=""
 
-UPSTREAM_DOCUMENTATION="$HOMEPAGE/${PN}_manual.html [[ lang = en description = [ Manual ] ]]"
+UPSTREAM_DOCUMENTATION="${HOMEPAGE}/${PN}_manual.html [[ lang = en description = [ Manual ] ]]"
 
 DEPENDENCIES="
   build:
diff --git a/packages/sys-fs/xfsprogs/xfsprogs-3.1.1.exheres-0 b/packages/sys-fs/xfsprogs/xfsprogs-3.1.1.exheres-0
index 058f04c..29c386a 100644
--- a/packages/sys-fs/xfsprogs/xfsprogs-3.1.1.exheres-0
+++ b/packages/sys-fs/xfsprogs/xfsprogs-3.1.1.exheres-0
@@ -4,7 +4,7 @@
 SUMMARY="XFS userspace tools"
 DESCRIPTION="Userspace utilities for the XFS filesystem including fsck and mkfs."
 HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-DOWNLOADS="ftp://oss.sgi.com/projects/xfs/cmd_tars/$PNV.tar.gz"
+DOWNLOADS="ftp://oss.sgi.com/projects/xfs/cmd_tars/${PNV}.tar.gz"
 
 LICENCES="GPL LGPL-2.1"
 SLOT="0"
@@ -17,15 +17,15 @@ DEPENDENCIES="
 "
 
 DEFAULT_SRC_CONFIGURE_PARAMS+=( OPTIMIZER=' ' DEBUG=' ' --sbindir=/sbin )
-DEFAULT_SRC_INSTALL_PARAMS+=( DIST_ROOT="$IMAGE" )
+DEFAULT_SRC_INSTALL_PARAMS+=( DIST_ROOT="${IMAGE}" )
 
 src_prepare() {
     default
-    edo sed -e "/^PKG_DOC_DIR\t=/s:@pkg_name@:$PNV:" -i include/builddefs.in
+    edo sed -e "/^PKG_DOC_DIR\t=/s:@pkg_name@:${PNV}:" -i include/builddefs.in
 }
 
 src_install() {
     default
-    edo rm "$IMAGE/usr/share/doc/$PNV/release.sh"
+    edo rm "${IMAGE}/usr/share/doc/${PNV}/release.sh"
 }