diff --git a/astronaut/astronautpkg b/astronaut/astronautpkg
index 902d95f..5ad52a2 100755
--- a/astronaut/astronautpkg
+++ b/astronaut/astronautpkg
@@ -31,4 +31,5 @@ fi
 [ "$dir_wrapper_pkgtools" ] && mkdir -p "$dir_wrapper_pkgtools" || dir_wrapper_pkgtools="$_topdir"
 cd "$dir_install"
 
-PATH=$PATH:/sbin $_fakeroot makepkg -l y -c n "$dir_wrapper_pkgtools/$_satname-$version-$(uname -m)-astro.tgz"
+export PATH="$PATH:/sbin"
+$_fakeroot makepkg -l y -c n "$dir_wrapper_pkgtools/$_satname-$version-$(uname -m)-astro.tgz"
diff --git a/satellites/yajl.sat b/satellites/yajl.sat
index 7596b2f..0708a73 100644
--- a/satellites/yajl.sat
+++ b/satellites/yajl.sat
@@ -14,6 +14,7 @@ cd "$name-$version"
 # Don't build the static library
 sed -i -e '/yajl_s/d' \
        -e '/COMMAND ${CMAKE_COMMAND}/d' src/CMakeLists.txt
+find . -name "CMakeLists.txt" -exec sed -i -e '/TARGET_LINK_LIBRARIES/s/yajl_s/yajl/' '{}' \;
 
 # Fix install dirs
 sed -i -e "s/lib\${LIB_SUFFIX}/$(safe_sed "$dir_libdir")/" \