diff --git a/Jamfile b/Jamfile
index a19f49f7f1..2c4b5197cb 100644
--- a/Jamfile
+++ b/Jamfile
@@ -158,7 +158,12 @@ if $(HAIKU_ADD_OPTIONAL_PACKAGES) {
 }
 
 #include packages that are required by all images.
-AddOptionalHaikuImagePackages MandatoryPackages ; 
+AddOptionalHaikuImagePackages MandatoryPackages ;
+
+# If enabled, make sure that OpenSSL is added to the image.
+if $(HAIKU_OPENSSL_ENABLED) {
+	AddOptionalHaikuImagePackages OpenSSL ;
+}
 
 # Evaluate optional package dependencies and prepare the optional build
 # features before parsing the Jamfile tree.
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 47b722f801..d369354ac9 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -27,11 +27,6 @@ if $(HAIKU_ATA_STACK) = 1 {
 	IDE_ONLY = "" ;
 }
 
-# Make sure that OpenSSL is added to the image.
-if $(HAIKU_OPENSSL_ENABLED) {
-	AddOptionalHaikuImagePackages OpenSSL ;
-}
-
 SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
 	cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
 	clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp