--- source/gnome-shell/js/ui/appDisplay.js	2011-08-23 09:04:26.118922120 +0200
+++ install/share/gnome-shell/js/ui/appDisplay.js	2011-08-24 00:32:01.449475230 +0200
@@ -649,11 +649,42 @@
                 this.close();
         }));
         source.actor.connect('destroy', Lang.bind(this, function () { this.actor.destroy(); }));
+				
+				if (this._source.app.get_name() == 'Files' ){
+					this.bookmarkItems = [];
+					this._createBookmarks();
+					Main.placesManager.connect('bookmarks-updated',Lang.bind(this,this._redisplayBookmarks));
+				}
 
         Main.uiGroup.add_actor(this.actor);
     },
+		
+		_redisplayBookmarks: function(){
+				this._clearBookmarks();
+				this._createBookmarks();
+		},
+
+		_createBookmarks : function() {
+				this.bookmarks = Main.placesManager.getBookmarks();
+				for (let bookmarkid = 0; bookmarkid < this.bookmarks.length; bookmarkid++) {
+						this.bookmarkItems[bookmarkid] = new PopupMenu.PopupMenuItem(_(this.bookmarks[bookmarkid].name));
+						this.bookmarkItems[bookmarkid].place = this.bookmarks[bookmarkid];
+						this.addMenuItem(this.bookmarkItems[bookmarkid]);
+						this.bookmarkItems[bookmarkid].connect('activate', function(actor,event) {
+								actor.place.launch();
+						});
+				}
+		},	
+			
+		_clearBookmarks : function(){
+				this.bookmarkItems = [];
+		},
 
     _redisplay: function() {
+				if (this._source.app.get_name() == 'Files'){
+					this._clearBookmarks();
+				}
+
         this.removeAll();
 
         let windows = this._source.app.get_windows();
@@ -683,7 +714,13 @@
 
             this._toggleFavoriteMenuItem = this._appendMenuItem(isFavorite ? _("Remove from Favorites")
                                                                 : _("Add to Favorites"));
-        }
+				}
+				if (this._source.app.get_name() == 'Files' ){
+					this._appendSeparator();
+					this._redisplayBookmarks();
+				}
+
+        
     },
 
     _appendSeparator: function () {
