diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index d64f50106f..97bf7b6e25 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -33,7 +33,7 @@ OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng libmodplu
 OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ;
 OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ;
 OptionalPackageDependencies Vim : GetText LibIconv ;
-OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite ;
+OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebPositiveBookmarks ;
 OptionalPackageDependencies wpa_supplicant : OpenSSL ;
 OptionalPackageDependencies XZ-Utils : Tar ;
 
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index b31f644762..de2e34a3a2 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -88,6 +88,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	Vim						- Vi IMproved. Highly configurable text editor
 #	Vision					- powerful native IRC client
 #	WebPositive				- native, WebKit-based web browser
+#	WebPositiveBookmarks	- bookmarks for WebPositive
 #	Welcome					- introductory documentation to Haiku
 #	WifiFirmwareScriptData	- data files needed by install-wifi-firmwares.sh
 #	WonderBrush				- native graphics application
@@ -1722,14 +1723,21 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
 		Echo "No optional package WebPositive available for gcc2" ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			WebPositive-gcc4-x86-r583-2012-01-23a.zip
-			: $(baseURL)/WebPositive-gcc4-x86-r583-2012-01-23a.zip ;
+			WebPositive-gcc4-x86-r584-2012-02-18.zip
+			: $(baseURL)/WebPositive-gcc4-x86-r584-2012-02-18.zip ;
 		AddSymlinkToHaikuImage home config settings deskbar Applications
 			: /boot/apps/WebPositive/WebPositive ;
 	}
 }
 
 
+# WebPositiveBookmarks
+if [ IsOptionalHaikuImagePackageAdded WebPositiveBookmarks ] {
+	InstallOptionalHaikuImagePackage WebPositiveBookmarks-2012-02-18.zip
+		: $(baseURL)/WebPositiveBookmarks-2012-02-18.zip
+		: home config settings WebPositive ;
+}
+
 # Welcome
 if [ IsOptionalHaikuImagePackageAdded Welcome ] {
 	CopyDirectoryToHaikuImage system documentation