diff --git a/security/dropbear/dropbear.conf b/security/dropbear/dropbear.conf
index fc0abf788..81dc626b0 100644
--- a/security/dropbear/dropbear.conf
+++ b/security/dropbear/dropbear.conf
@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../dropbear/dropbear.conf
+# Copyright (C) 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -11,20 +12,16 @@
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
-ALL_PRG="\"dropbear dbclient dropbearkey dropbearconvert scp\""
-CLIENT_PRG="\"dbclient scp\""
 
-if [ $pkg = "dropbear" ] ; then
-
-	if [ "$SDECFG_PKG_DROPBEAR_CLIENTONLY" == 1 ]; then
-		var_append makeopt 	" " "PROGRAMS=$CLIENT_PRG"
-		var_append makeinstopt	" " "PROGRAMS=$CLIENT_PRG"
-	else
-		var_append makeopt      " " "PROGRAMS=$ALL_PRG"
-		var_append makeinstopt	" " "PROGRAMS=$ALL_PRG"
-	fi
+if [ "$SDECFG_PKG_DROPBEAR_CLIENTONLY" == 1 ]; then
+	PROGRAMS="'dropbear dbclient dropbearkey dropbearconvert scp'"
+else
+	PROGRAMS="'dbclient scp'"
 fi
 
+var_append makeopt 	" " "PROGRAMS=$PROGRAMS"
+var_append makeinstopt	" " "PROGRAMS=$PROGRAMS"
+
 var_append makeopt " " "LD=${archprefix}gcc"
 hook_add postmake 5 "cp -fv drop*.8 $root/$mandir/man8/"