diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index b12bbd1999..00d38406ab 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -12,9 +12,9 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
 }
 
 if $(HAIKU_GCC_VERSION[1]) >= 4 {
-	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc4-2011-05-20.zip ;
+	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc4-2011-09-08.zip ;
 } else {
-	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc2-2011-05-17.zip ;
+	HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc2-2011-09-09.zip ;
 }
 
 local baseURL = http://haiku-files.org/files/optional-packages ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 12c5e08b12..2db287c254 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1250,12 +1250,12 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
 
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
-				openssh-5.8p2-r1a3-x86-gcc4-2011-05-24.zip
-				: $(baseURL)/openssh-5.8p2-r1a3-x86-gcc4-2011-05-24.zip ;
+				openssh-5.9p1-x86-gcc4-2011-09-08.zip
+				: $(baseURL)/openssh-5.9p1-x86-gcc4-2011-09-08.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				openssh-5.8p2-r1a3-x86-gcc2-2011-05-18.zip
-				: $(baseURL)/openssh-5.8p2-r1a3-x86-gcc2-2011-05-18.zip ;
+				openssh-5.9p1-x86-gcc2-2011-09-09.zip
+				: $(baseURL)/openssh-5.9p1-x86-gcc2-2011-09-09.zip ;
 		}
 
 		AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true