diff --git a/scripts/create-pkg-config.sh b/scripts/create-pkg-config.sh
index f4bd2c49..b246e6d5 100644
--- a/scripts/create-pkg-config.sh
+++ b/scripts/create-pkg-config.sh
@@ -1,10 +1,26 @@
 #!/bin/bash
 
+log()
+{
+	echo $@
+}
+
+err()
+{
+	echo $@ >&2
+}
+
+fatal()
+{
+	err "Fatal: $@"
+	exit 1
+}
+
 try_assign_sec()
 {
 	local file="$1"
 	local sec="$2"
-	local val=`_jw-build_cat_section "$file" "$sec"`
+	local val=`_jwbuild_cat_section "$file" "$sec"`
 	[ -n "$val" ] && eval $3=\"$val\"
 }
 
@@ -106,7 +122,17 @@ shift
 set +e
 
 [ -r "$project_descr_file" ] && {
-	. jw-build-functions.sh
+
+	build_functions_sh=jw-build-functions.sh
+	for d in `dirname $0`; do
+		[ -f "$d/$build_functions_sh" ] && {
+			build_functions_sh_path=$d/$build_functions_sh
+			break
+		}
+	done
+	[ "$build_functions_sh_path" ] || fatal "$build_functions_sh not found"
+	. $build_functions_sh_path
+
 	try_assign_sec $project_descr_file description descr
 	try_assign_sec $project_descr_file summary summary
 	try_assign_sec $project_descr_file requires_run requires_run