diff --git a/security/openssh/config.in b/security/openssh/config.in
index b92eb45e5..b19fac37c 100644
--- a/security/openssh/config.in
+++ b/security/openssh/config.in
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../openssh/config.in
-# Copyright (C) 2009 The OpenSDE Project
+# Copyright (C) 2009 - 2010 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -20,5 +20,7 @@ if pkgcheck openssh X; then
 			bool 'Include LDAP Public Key Support' \
 				SDECFG_PKG_OPENSSH_LPK 0
 		fi
+
+		bool 'Build sftp-server only' SDECFG_PKG_OPENSSH_SFTPONLY 0
 	menu_end
 fi
diff --git a/security/openssh/openssh.conf b/security/openssh/openssh.conf
index 20ec741b2..9b6d3f153 100644
--- a/security/openssh/openssh.conf
+++ b/security/openssh/openssh.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../openssh/openssh.conf
-# Copyright (C) 2007 - 2009 The OpenSDE Project
+# Copyright (C) 2007 - 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -14,7 +14,13 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-makeinstopt="install-nokeys"
+if [ "$SDECFG_PKG_OPENSSH_SFTPONLY" = 1 ]; then
+	var_append makeopt ' ' 'sftp-server'
+	makeinstopt=
+	hook_add postmake 5 "cp sftp-server '$root$libdir/'"
+else
+	makeinstopt="install-nokeys"
+fi
 
 if atstage cross ; then
         LD="$root/TOOLCHAIN/$toolsdir/crosscc/$CC"