diff --git a/www-client/mozilla-firefox/bookmarks.html b/www-client/mozilla-firefox/bookmarks.html
index dc069e687..39a022957 100644
--- a/www-client/mozilla-firefox/bookmarks.html
+++ b/www-client/mozilla-firefox/bookmarks.html
@@ -12,19 +12,29 @@
     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3>
 <DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
     <DL><p>
-        <DT><A HREF="http://www.haiku-os.org">Haiku</A>
+        <DT><A HREF="http://www.haiku-os.org">Haiku WebSite</A>
+        <DT><A HREF="http://haiku-files.org/">Nightly Builds</A>
     </DL><p>
     <HR>
     <DT><H3>BeZilla Browser</H3>
     <DL><p>
-        <DT><A HREF="http://bezilla.livejournal.com" >BeZilla Blog</A>
-        <DT><A HREF="http://ports.haiku-files.org/">Report an Issue</A>
+        <DT><A HREF="http://bezilla.livejournal.com">BeZilla Blog</A>
+        <DT><A HREF="http://ports.haiku-files.org/newticket">Report an Issue</A>
         <DT><A HREF="http://ports.haiku-files.org/query?component=www-client%2Fmozilla-firefox&col=id&col=summary&col=status&col=owner&col=type&col=priority&col=milestone&order=priority">View Known Issues</A>
     </DL><p>
+    <DT><H3>Haiku Bookmarks</H3>
+    <DL><p>
+        <DT><A HREF="http://haiku-files.org/">Nightly Builds</A>
+        <DT><A HREF="http://haiku-files.org/files/optional-packages/">Optional Packages</A>
+        <DT><A HREF="http://dev.haiku-os.org/">Bug Tracker</A>
+    </DL></p>
 	<DT><H3>Software for Haiku</H3>
-    <DT><A HREF="http://dev.osdrawer.net">OSDrawer.net</A>
-    <DT><A HREF="http://www.haikuware.com">HaikuWare</A>
-    <DT><A HREF="http://zeta-games.com/">Zeta-Games</A>
-    <DT><A HREF="http://www.bebits.com">BeBits</A>
-    
+	<DL><p>
+        <DT><A HREF="http://dev.osdrawer.net">OSDrawer.net</A>
+        <DT><A HREF="http://www.haikuware.com">HaikuWare</A>
+        <DT><A HREF="http://zeta-games.com/">Zeta-Games</A>
+        <DT><A HREF="http://www.bebits.com">BeBits</A>
+    </DL><p>
+    <DT><A HREF="http://www.haiku-os.org">Haiku WebSite</A>
+	    
 </DL><p>