diff --git a/mozilla/browser/base/content/browserMountPoints.inc b/mozilla/browser/base/content/browserMountPoints.inc
index 7dab0439531..ca86620c5f5 100644
--- a/mozilla/browser/base/content/browserMountPoints.inc
+++ b/mozilla/browser/base/content/browserMountPoints.inc
@@ -2,6 +2,9 @@
 
 <commandset id="mainCommandSet"/>
 <commandset id="baseMenuCommandSet"/>
+#ifdef MOZ_PLACES_BOOKMARKS
+<commandset id="placesCommands"/>
+#endif
 
 <broadcasterset id="mainBroadcasterSet"/>
 
@@ -10,6 +13,8 @@
 
 <menubar id="main-menubar"/>
 
+#ifndef MOZ_PLACES_BOOKMARKS
 <template id="bookmarks-template"/>
+#endif
 
 <tree id="hiddenHistoryTree"/>