diff --git a/build-pkg b/build-pkg
index b44147cff..529421fbb 100644
--- a/build-pkg
+++ b/build-pkg
@@ -65,7 +65,7 @@ pkg_autodetect_type() {
 
 pkg_set_type() {
     PSUF=`queryconfig binarytype --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH"`
-    test "$PSUF" = UNKNOWN && PSUF=
+    test "$PSUF" = UNDEFINED && PSUF=
     case "$PSUF" in
 	rpm|deb|arch)
 	    ;;
diff --git a/init_buildsystem b/init_buildsystem
index 180cb4e22..adf513dde 100755
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -280,7 +280,7 @@ create_cache_file() {
 	BINTYPE=
 	if test -n "$BUILD_DIST" ; then
 	    BINTYPE=`queryconfig binarytype --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH"`
-	    test "$BINTYPE" = UNKNOWN && BINTYPE=
+	    test "$BINTYPE" = UNDEFINED && BINTYPE=
 	fi
 	for SRC in "${repos[@]}" -- ${BUILD_RPMS//:/ /}; do
 	    if test "$SRC" = '--' ; then