diff --git a/data/pkgconfig.sh b/data/pkgconfig.sh
index 83479f5..3c1d191 100755
--- a/data/pkgconfig.sh
+++ b/data/pkgconfig.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2011-2015 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2011-2017 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -66,7 +66,7 @@ _usage()
 clean=0
 install=0
 uninstall=0
-while getopts "ciuP:" name; do
+while getopts "ciuO:P:" name; do
 	case $name in
 		c)
 			clean=1
@@ -79,6 +79,9 @@ while getopts "ciuP:" name; do
 			install=0
 			uninstall=1
 			;;
+		O)
+			export "${OPTARG%%=*}"="${OPTARG#*=}"
+			;;
 		P)
 			PREFIX="$OPTARG"
 			;;
@@ -89,7 +92,7 @@ while getopts "ciuP:" name; do
 	esac
 done
 shift $(($OPTIND - 1))
-if [ $# -eq 0 ]; then
+if [ $# -lt 0 ]; then
 	_usage
 	exit $?
 fi
@@ -148,6 +151,7 @@ while [ $# -gt 0 ]; do
 	#create
 	source="${target#$OBJDIR}"
 	source="${source}.in"
+	([ -z "$OBJDIR" ] || $DEBUG $MKDIR -- "${target%/*}")	|| exit 2
 	$DEBUG $SED -e "s;@PACKAGE@;$PACKAGE;" \
 			-e "s;@VERSION@;$VERSION;" \
 			-e "s;@PREFIX@;$PREFIX;" \
diff --git a/doc/docbook.sh b/doc/docbook.sh
index 620374f..115bc92 100755
--- a/doc/docbook.sh
+++ b/doc/docbook.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2012-2015 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2012-2017 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -114,7 +114,7 @@ _usage()
 clean=0
 install=0
 uninstall=0
-while getopts "ciuP:" name; do
+while getopts "ciO:uP:" name; do
 	case "$name" in
 		c)
 			clean=1
@@ -123,6 +123,9 @@ while getopts "ciuP:" name; do
 			uninstall=0
 			install=1
 			;;
+		O)
+			export "${OPTARG%%=*}"="${OPTARG#*=}"
+			;;
 		u)
 			install=0
 			uninstall=1
@@ -137,7 +140,7 @@ while getopts "ciuP:" name; do
 	esac
 done
 shift $((OPTIND - 1))
-if [ $# -eq 0 ]; then
+if [ $# -lt 1 ]; then
 	_usage
 	exit $?
 fi
diff --git a/po/gettext.sh b/po/gettext.sh
index 5bb7c9b..5f07dc2 100755
--- a/po/gettext.sh
+++ b/po/gettext.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2010-2015 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2010-2017 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -112,7 +112,7 @@ _gettext_pot()
 clean=0
 install=0
 uninstall=0
-while getopts "ciuP:" name; do
+while getopts "ciO:uP:" name; do
 	case "$name" in
 		c)
 			clean=1
@@ -121,6 +121,9 @@ while getopts "ciuP:" name; do
 			uninstall=0
 			install=1
 			;;
+		O)
+			export "${OPTARG%%=*}"="${OPTARG#*=}"
+			;;
 		u)
 			install=0
 			uninstall=1
@@ -135,7 +138,7 @@ while getopts "ciuP:" name; do
 	esac
 done
 shift $(($OPTIND - 1))
-if [ $# -eq 0 ]; then
+if [ $# -lt 1 ]; then
 	_usage
 	exit $?
 fi
diff --git a/tools/subst.sh b/tools/subst.sh
index 7fe7d1e..1389192 100755
--- a/tools/subst.sh
+++ b/tools/subst.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2012-2016 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2012-2017 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -70,7 +70,7 @@ _subst()
 				LDSO="/libexec/ld-elf.so.1"
 			;;
 			Linux)
-				LDSO="/lib/ld-linux-$(uname -p).so.2"
+				LDSO="/lib/ld-linux-$(uname -m | tr _ -).so.2"
 				;;
 			*)
 				LDSO="/libexec/ld.elf_so"
@@ -112,6 +112,8 @@ _subst()
 		#create
 		source="${target#$OBJDIR}"
 		source="${source}.in"
+		([ -z "$OBJDIR" ] || $DEBUG $MKDIR -- "${target%/*}") \
+								|| return 2
 		$DEBUG $SED -e "s;@PACKAGE@;$PACKAGE;g" \
 			-e "s;@VERSION@;$VERSION;g" \
 			-e "s;@PREFIX@;$PREFIX;g" \
@@ -190,7 +192,7 @@ while getopts "ciuO:P:" name; do
 	esac
 done
 shift $(($OPTIND - 1))
-if [ $# -eq 0 ]; then
+if [ $# -lt 1 ]; then
 	_usage
 	exit $?
 fi