diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg
index 9cb5205..32df3d8 100755
--- a/scripts/Build-Pkg
+++ b/scripts/Build-Pkg
@@ -3,7 +3,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: scripts/Build-Pkg
-# Copyright (C) 2006 - 2009 The OpenSDE Project
+# Copyright (C) 2006 - 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -39,6 +39,9 @@ chroot=0
 root=
 id=
 
+build_parallel=
+build_debug=
+
 stagelevel=9
 this_is_the_2nd_run=0
 
@@ -52,6 +55,7 @@ help_msg() {
 	echo "Usage: ./scripts/Build-Pkg" \
 	             "[ -0 | -1 | -2  ... | -8 | -9 ]           \\"
 	echo "$spacer [ -v ]  [ -xtrace ]  [ -chroot ]          \\"
+	echo "$spacer [ -d ]  [ -j <n> ]                        \\"
 	echo "$spacer [ -root { <rootdir> | auto } ]            \\"
 	echo "$spacer [ -cfg <config> ]  [ -update ]            \\"
 	echo "$spacer [ -prefix <prefix-dir> ]  [ -norebuild ]  \\"
@@ -71,6 +75,8 @@ while [ "$1" ] ; do
 		-v)       options="$options $1"    ; verbose=1     ;;
 		-xtrace)  options="$options $1"    ; xtrace=1      ;;
 		-debug)   options="$options $1"    ; debug=1 ; clear_src=0 ;;
+		-j)       options="$options $1 $2" ; build_parallel=$2 ; shift ;;
+		-d)       options="$options $1"    ; build_debug=1 ;;
 		-update)  options="$options $1"    ; update=1      ;;
 		-chroot)  options="$options $1"    ; chroot=1      ;;
 		-chr-sub) options="$options $1"    ; chroot=0      ;;
@@ -96,6 +102,9 @@ fi
 . lib/functions.in
 . lib/parse-config
 
+[ -z "$build_debug" ] || export "SDECFG_DEBUG=$build_debug"
+[ -z "$build_parallel" ] || export "SDECFG_PARALLEL_MAX=$build_parallel"
+
 if [ -z "$root" -a $stagelevel -le 1 ] ||
    [ -z "$root" -a $chroot -eq 1 ] ||
    [ "$root" = auto ]; then
diff --git a/scripts/Build-Target b/scripts/Build-Target
index 975f0aa..5d3372a 100755
--- a/scripts/Build-Target
+++ b/scripts/Build-Target
@@ -3,7 +3,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: scripts/Build-Target
-# Copyright (C) 2006 - 2009 The OpenSDE Project
+# Copyright (C) 2006 - 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -31,15 +31,20 @@ daemon_mode=0
 autodownload=1
 options="$*"
 downloadopt="-q"
+build_parallel=
+build_debug=
 
 while [ $# -gt 0 ] ; do
 	case "$1" in
 		-cfg)		config=$2 ; shift ;;
 		-job)		build_only_this_job=$2 ; shift ;;
+		-j)		build_parallel=$2 ; shift ;;
+		-d)		build_debug=1 ;;
 		-daemon)	daemon_mode=1 ;;
 		-nodaemon)	daemon_mode=0 ;;
 		-nodownload)	autodownload=0 ;;
 		*)		echo "Usage: $0 [ -daemon ] [ -nodownload ] [ -cfg config ]" \
+				     " [ -j <n> ] [-d] " \
 				     "[ -job <stage>-<package> ]" ; exit 1 ;;
 	esac
 	shift
@@ -205,6 +210,8 @@ pkgloop_package() {
 	fi
 
 	cmd_buildpkg="./scripts/Build-Pkg -$stagelevel -cfg $config"
+	[ -z "$build_debug" ] || cmd_buildpkg="$cmd_buildpkg -d"
+	[ -z "$build_parallel" ] || cmd_buildpkg="$cmd_buildpkg -j $build_parallel"
 	cmd_buildpkg="$cmd_buildpkg $cmd_root $cmd_prefix $pkg_name"
 
 	# Execute action handler