diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 8550f852b1..49f722859a 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -17,6 +17,7 @@
 
 # package dependencies
 OptionalPackageDependencies Development : Perl ;
+OptionalPackageDependencies OpenSSH : OpenSSL ;
 
 
 # Development
@@ -160,6 +161,23 @@ if [ IsOptionalHaikuImagePackageAdded OpenSound ] {
 }
 
 
+# OpenSSH
+if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
+	if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		Echo "No optional package OpenSSH available for gcc4" ;
+	} else {
+		local baseURL = http://haiku-files.org/files/optional-packages ;
+		InstallOptionalHaikuImagePackage openssh-5.0p1-gcc2-2008-05-04
+			: $(baseURL)/openssh-5.0p1-gcc2-2008-05-04.zip
+			:
+		;
+
+		AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
+			: "sshd user" ;
+	}
+}
+
+
 # OpenSSL
 if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
 	if $(HAIKU_GCC_VERSION[1]) >= 4 {