diff --git a/config.sh b/config.sh
index a07130ed15f83f339db9f40ae89c2026543eb04f..f383679e274d02cfcbcbee8ccd9fe918262c44d5 100755
--- a/config.sh
+++ b/config.sh
@@ -9,8 +9,20 @@ HOST=$TARGET
 # Automatic variables
 ROOT="$(cd `dirname "$0"` && pwd)"
 REPO="$ROOT/repo/$TARGET"
-export CC="$HOST-gcc"
-export XARGO_HOME="$ROOT/xargo"
+export XARGO_HOME="${ROOT}/xargo"
+
+export AR="${HOST}-ar"
+export AS="${HOST}-as"
+export CC="${HOST}-gcc"
+export CXX="${HOST}-g++"
+export LD="${HOST}-ld"
+export NM="${HOST}-nm"
+export OBJCOPY="${HOST}-objcopy"
+export OBJDUMP="${HOST}-objdump"
+export PKG_CONFIG="${HOST}-pkg-config"
+export RANLIB="${HOST}-ranlib"
+export READELF="${HOST}-readelf"
+export STRIP="${HOST}-strip"
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
     # GNU find
diff --git a/cook.sh b/cook.sh
index 0de729bdae6078ad1a89836b0ae592cb4d1af08e..a606b629ba8e0dd138ddfe775fa1cacc68ebd3b2 100755
--- a/cook.sh
+++ b/cook.sh
@@ -422,6 +422,16 @@ then
     if [ -d "$ROOT/recipes/$1" ]
     then
         cd "$ROOT/recipes/$1"
+
+        function x86_64-unknown-redox-pkg-config {
+            export PKG_CONFIG_PATH=
+            export PKG_CONFIG_DIR=
+            export PKG_CONFIG_LIBDIR="$PWD/sysroot/lib/pkgconfig"
+            export PKG_CONFIG_SYSROOT_DIR="$PWD/sysroot"
+
+            exec pkg-config "$@"
+        }
+
         source recipe.sh
 
         ops=()
diff --git a/recipes/cmatrix/recipe.sh b/recipes/cmatrix/recipe.sh
index 171789b3470d1ffa436098eecdf458ecfcb7d1cc..4e3722c60a7304597477d0f3522c0f14d694155a 100644
--- a/recipes/cmatrix/recipe.sh
+++ b/recipes/cmatrix/recipe.sh
@@ -2,18 +2,6 @@ GIT=https://github.com/abishekvashok/cmatrix
 BUILD_DEPENDS=(ncurses)
 DEPENDS=(terminfo)
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
     skip=1
@@ -29,7 +17,7 @@ function recipe_build {
     export LDFLAGS="-L$sysroot/lib"
     export CPPFLAGS="-I$sysroot/include"
     ./configure --host=${HOST} --prefix=/ --without-fonts
-    make 
+    make
     skip=1
 }
 
diff --git a/recipes/curl/recipe.sh b/recipes/curl/recipe.sh
index a64a6b9fb74e209b6964556f8671fa6fbe63be18..6e1fa519dba6bee4bb0b3746e8a109a6b8f19dd0 100644
--- a/recipes/curl/recipe.sh
+++ b/recipes/curl/recipe.sh
@@ -34,6 +34,6 @@ function recipe_clean {
 function recipe_stage {
     dest="$(realpath $1)"
     make DESTDIR="$dest" install
-    rm -rf "$1"/{share,lib/pkgconfig}
+    rm -rf "$1"/share
     skip=1
 }
diff --git a/recipes/dash/recipe.sh b/recipes/dash/recipe.sh
index 83bc8687793e682101ea08b0406f7a46f87245eb..93baa757dff0f740fdbc01a0048cdb88b10362b0 100644
--- a/recipes/dash/recipe.sh
+++ b/recipes/dash/recipe.sh
@@ -1,18 +1,6 @@
 GIT=https://github.com/redox-os/dash.git
 BRANCH=redox
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
     skip=1
diff --git a/recipes/gcc/recipe.sh b/recipes/gcc/recipe.sh
index 1ce91e8312fe64c23de4af2e7dda36c2268174fe..a6681a1f23e269819ed3fbe0dae88cf675899e65 100644
--- a/recipes/gcc/recipe.sh
+++ b/recipes/gcc/recipe.sh
@@ -2,18 +2,6 @@ GIT=https://github.com/redox-os/gcc.git
 BRANCH=redox
 DEPENDS="gnu-binutils newlib"
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
     skip=1
diff --git a/recipes/git/recipe.sh b/recipes/git/recipe.sh
index cedf42ac61787e7a9963ec944533c70cf3d5a003..6469d57e584ca5930faa590e287b2bdc64420444 100644
--- a/recipes/git/recipe.sh
+++ b/recipes/git/recipe.sh
@@ -3,18 +3,6 @@ TAR=https://www.kernel.org/pub/software/scm/git/git-$VERSION.tar.xz
 BUILD_DEPENDS=(zlib curl openssl expat)
 DEPENDS="ca-certificates"
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 MAKEFLAGS="NO_MMAP=1 NEEDS_SSL_WITH_CURL=1 NEEDS_CRYPTO_WITH_SSL=1 NO_UNIX_SOCKETS=1 NEEDS_LIBICONV= NEEDS_LIBRT= BLK_SHA1=1"
 
 function recipe_version {
diff --git a/recipes/gnu-binutils/recipe.sh b/recipes/gnu-binutils/recipe.sh
index 4475c0c09e9d0b6af087a4edf5ce78334faf61e0..1176b38547b2d514a0740f247309afeacc63e395 100644
--- a/recipes/gnu-binutils/recipe.sh
+++ b/recipes/gnu-binutils/recipe.sh
@@ -1,17 +1,5 @@
 GIT=https://github.com/redox-os/binutils-gdb.git
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
     skip=1
diff --git a/recipes/gnu-make/recipe.sh b/recipes/gnu-make/recipe.sh
index 2d41262f432f5f5b41965c5c777acbef4737e535..517e6e8a83cee234f70883674f423e01de6369a1 100644
--- a/recipes/gnu-make/recipe.sh
+++ b/recipes/gnu-make/recipe.sh
@@ -1,18 +1,6 @@
 VERSION=4.2.1
 TAR=https://ftp.gnu.org/gnu/make/make-$VERSION.tar.gz
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
     echo "$VERSION"
     skip=1
diff --git a/recipes/jansson/recipe.sh b/recipes/jansson/recipe.sh
index 9bfb31217391d908935c10dcbda8a5fbd478b629..e79db3276e179500b7d72487dc1d1f131d7986c8 100644
--- a/recipes/jansson/recipe.sh
+++ b/recipes/jansson/recipe.sh
@@ -1,18 +1,6 @@
 VERSION=2.10
 TAR=http://www.digip.org/jansson/releases/jansson-$VERSION.tar.gz
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
     echo "$VERSION"
     skip=1
@@ -27,7 +15,7 @@ function recipe_build {
     sysroot="${PWD}/../sysroot"
     export LDFLAGS="-L$sysroot/lib"
     export CPPFLAGS="-I$sysroot/include"
-    ./configure --host=${HOST} --prefix=/ 
+    ./configure --host=${HOST} --prefix=/
     make 
     skip=1
 }
diff --git a/recipes/mdp/recipe.sh b/recipes/mdp/recipe.sh
index c24965373fc0815fc5110629844cacacec4d20a1..91fd7812b135ac83979f36f176701eba3f684351 100644
--- a/recipes/mdp/recipe.sh
+++ b/recipes/mdp/recipe.sh
@@ -14,8 +14,6 @@ function recipe_update {
 
 function recipe_build {
     sysroot="${PWD}/../sysroot"
-    export CC="${HOST}-gcc"
-    export LD="${HOST}-ld"
     export CFLAGS="-I$sysroot/include -I$sysroot/include/ncursesw"
     export LDFLAGS="-L$sysroot/lib"
 
diff --git a/recipes/netsurf/recipe.sh b/recipes/netsurf/recipe.sh
index 4da623a2c0e19a3698ce9258086c464bd1616c9b..1e348ee04b6f68187d49ef1ae9fdfdbc020334db 100644
--- a/recipes/netsurf/recipe.sh
+++ b/recipes/netsurf/recipe.sh
@@ -2,19 +2,6 @@ VERSION=3.7
 TAR=http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$VERSION.tar.gz
 BUILD_DEPENDS=(expat curl sdl openssl zlib)
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
-export PKG_CONFIG_ALLOW_CROSS=1
 export PKG_CONFIG_PATH=
 export PKG_CONFIG_LIBDIR="$PWD/sysroot/lib/pkgconfig"
 export PKG_CONFIG_SYSROOT_DIR="$PWD/sysroot"
@@ -31,11 +18,11 @@ function recipe_update {
 
 function recipe_build {
     sysroot="${PWD}/../sysroot"
-    export CFLAGS="-I$sysroot/include"
-    export LDFLAGS="-L$sysroot/lib"
     export TARGET="framebuffer"
+    export CFLAGS="-I$sysroot/include -I${PWD}/inst-${TARGET}/include"
+    export LDFLAGS="-L$sysroot/lib -L${PWD}/inst-${TARGET}/lib"
 
-    make
+    make V=1
     skip=1
 }
 
diff --git a/recipes/newlibtest/recipe.sh b/recipes/newlibtest/recipe.sh
index fdbed7c511881811288f75f1738aa35dd2a0a4f8..b2bedf8369c129165cbeabba5aab0d5191832882 100644
--- a/recipes/newlibtest/recipe.sh
+++ b/recipes/newlibtest/recipe.sh
@@ -13,8 +13,6 @@ function recipe_update {
 
 function recipe_build {
     sysroot="${PWD}/../sysroot"
-    export CC="${HOST}-gcc"
-    export LD="${HOST}-ld"
     export CFLAGS="-static -nostdinc -I $sysroot/include -I /usr/lib/gcc/x86_64-unknown-redox/7.0.1/include/ -nostdlib -L $sysroot/lib"
     export CRT="$sysroot/lib/crt0.o"
     export CLIBS="-lc -lm"
diff --git a/recipes/openssl/recipe.sh b/recipes/openssl/recipe.sh
index 5aef73cb30e9dcd9bd2419af4da917f1a9e917df..872d9d9807afdfa7cdb11e7b111f3412347055ef 100644
--- a/recipes/openssl/recipe.sh
+++ b/recipes/openssl/recipe.sh
@@ -30,7 +30,6 @@ function recipe_clean {
 function recipe_stage {
     dest="$(realpath $1)"
     make DESTDIR="$dest" install
-    rm -rf "$1/lib/pkgconfig" # pkg-config returns paths based on / prefix, breaking cross compile
     rm -rf "$1/{share,ssl}"
     skip=1
 }
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
index 9b257bb24374a55840e8e4f34ee59171be7dca50..5c8ca112365a4546502a293c37cabf6f47181bbf 100644
--- a/recipes/python/recipe.sh
+++ b/recipes/python/recipe.sh
@@ -1,18 +1,6 @@
 VERSION=3.6.2
 TAR=https://www.python.org/ftp/python/$VERSION/Python-$VERSION.tar.xz
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 export CONFIG_SITE=config.site
 
 function recipe_version {
diff --git a/recipes/ssh/recipe.sh b/recipes/ssh/recipe.sh
index 4608ab05820a028a2fcb5f26fac39a9f026b13bb..c69a290783607c762c08343cee8a39dde6fbd90c 100644
--- a/recipes/ssh/recipe.sh
+++ b/recipes/ssh/recipe.sh
@@ -2,18 +2,6 @@ VERSION=7.6p1
 TAR=http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$VERSION.tar.gz
 BUILD_DEPENDS=(zlib openssl)
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-gcc"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
     echo "$VERSION"
     skip=1
@@ -53,12 +41,12 @@ function newlib_build {
 }
 
 function recipe_build {
-    newlib_build 
+    newlib_build
     sysroot="${PWD}/../sysroot"
     export LDFLAGS="-L$sysroot/lib"
     export CPPFLAGS="-I$sysroot/include"
     ./configure --host=${HOST} --prefix=/
-    make 
+    make
     skip=1
 }
 
diff --git a/recipes/vim/recipe.sh b/recipes/vim/recipe.sh
index b0b64523d275a35b6a82a67d233a486dcc3dca18..48a920e83f59711c04b692227d37c12f8e15576a 100644
--- a/recipes/vim/recipe.sh
+++ b/recipes/vim/recipe.sh
@@ -3,18 +3,6 @@ TAR=http://ftp.vim.org/vim/unix/vim-$VERSION.tar.bz2
 BUILD_DEPENDS=(ncurses)
 DEPENDS="terminfo"
 
-export AR="${HOST}-ar"
-export AS="${HOST}-as"
-export CC="${HOST}-gcc"
-export CXX="${HOST}-g++"
-export LD="${HOST}-ld"
-export NM="${HOST}-nm"
-export OBJCOPY="${HOST}-objcopy"
-export OBJDUMP="${HOST}-objdump"
-export RANLIB="${HOST}-ranlib"
-export READELF="${HOST}-readelf"
-export STRIP="${HOST}-strip"
-
 function recipe_version {
     echo "$VERSION"
     skip=1