diff --git a/target/generic/config.in b/target/generic/config.in
index 51ce211..90b2daa 100644
--- a/target/generic/config.in
+++ b/target/generic/config.in
@@ -3,7 +3,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
 # Filename: target/generic/config.in
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -38,13 +38,14 @@ choice SDECFG_PKGSEL_TPL none none 'No package preselection template' \
 if [ "$SDECFG_PKGSEL_TPL" != none ]; then
 	if [ ! -f $cfgtmpdir/pkgsel.$SDECFG_PKGSEL_TPL.awk ]; then
 
-	( echo "# created from 'package preselection templates'"
-	  pkgsel_init
-	  cat $( ls -1  target/$target/pkgsel/*.choice | 
-	  	sed -n "s,^.*/\([0-9][0-9]-\)\?$SDECFG_PKGSEL_TPL.choice,\0,p" ) |
-		pkgsel_parse
-	  pkgsel_finish
-	) > $cfgtmpdir/pkgsel.$SDECFG_PKGSEL_TPL.awk
+		cat <<-EOT > $cfgtmpdir/pkgsel.$SDECFG_PKGSEL_TPL.awk
+		# created from '$SDECFG_PKGSEL_TPL' template
+		#
+		EOT
+
+		lib/sde-config/pkgsel2awk.sh \
+			$( ls -1 target/$target/pkgsel/{[0-9][0-9]-,}$SDECFG_PKGSEL_TPL.choice 2> /dev/null ) \
+			>> $cfgtmpdir/pkgsel.$SDECFG_PKGSEL_TPL.awk
 	fi
 
 	pkgfilter awk -f $cfgtmpdir/pkgsel.$SDECFG_PKGSEL_TPL.awk