diff --git a/debian/changelog b/debian/changelog
index 7028c05..a750664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mintmenu (5.2.7) lisa; urgency=low
+
+  * Replaced system and places shortcut in MATE to use caja and mate-terminal
+
+ -- Clement Lefebvre <root@linuxmint.com>  Mon, 28 Nov 2011 12:43:49 +0000
+
 mintmenu (5.2.6) lisa; urgency=low
 
   * Adjusted dependencies for MATE
diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/lib/linuxmint/mintMenu/plugins/places.py
index e44d2e4..6fee8c1 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/places.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/places.py
@@ -147,7 +147,7 @@ class pluginclass( object ):
         if ( self.showcomputer == True ):
             Button1 = easyButton( "computer", self.iconsize, [_("Computer")], -1, -1 )
             if self.de == "mate":
-                Button1.connect( "clicked", self.ButtonClicked, "nautilus computer:" )
+                Button1.connect( "clicked", self.ButtonClicked, "caja computer:" )
             else:
                 Button1.connect( "clicked", self.ButtonClicked, "xdg-open /" )
             Button1.show()
@@ -156,7 +156,10 @@ class pluginclass( object ):
 
         if ( self.showhomefolder == True ):
             Button2 = easyButton( "user-home", self.iconsize, [_("Home Folder")], -1, -1 )
-            Button2.connect( "clicked", self.ButtonClicked, "xdg-open %s " % home )
+            if self.de == "mate":
+                Button2.connect( "clicked", self.ButtonClicked, "caja %s " % home )
+            else:
+                Button2.connect( "clicked", self.ButtonClicked, "xdg-open %s " % home )
             Button2.show()
             self.placesBtnHolder.pack_start( Button2, False, False )
             self.mintMenuWin.setTooltip( Button2, _("Open your personal folder") )
@@ -168,7 +171,10 @@ class pluginclass( object ):
                 Button3 = easyButton( "notification-network-ethernet-connected", self.iconsize, [_("Network")], -1, -1)
             else:
                 Button3 = easyButton( "network-workgroup", self.iconsize, [_("Network")], -1, -1)
-            Button3.connect( "clicked", self.ButtonClicked, "nautilus network:" )
+            if self.de == "mate":
+                Button3.connect( "clicked", self.ButtonClicked, "caja network:" )
+            else:
+                Button3.connect( "clicked", self.ButtonClicked, "xdg-open network:" )
             Button3.show()
             self.placesBtnHolder.pack_start( Button3, False, False )
             self.mintMenuWin.setTooltip( Button3, _("Browse bookmarked and local network locations") )
@@ -188,7 +194,10 @@ class pluginclass( object ):
             except Exception, detail:
                 print detail
             Button4 = easyButton( "mate-fs-desktop", self.iconsize, [_("Desktop")], -1, -1 )
-            Button4.connect( "clicked", self.ButtonClicked, "xdg-open \"" + desktopDir + "\"")
+            if self.de == "mate":
+                Button4.connect( "clicked", self.ButtonClicked, "caja \"" + desktopDir + "\"")
+            else:
+                Button4.connect( "clicked", self.ButtonClicked, "xdg-open \"" + desktopDir + "\"")
             Button4.show()
             self.placesBtnHolder.pack_start( Button4, False, False )
             self.mintMenuWin.setTooltip( Button4, _("Browse items placed on the desktop") )
@@ -197,6 +206,8 @@ class pluginclass( object ):
             self.trashButton = easyButton( "user-trash", self.iconsize, [_("Trash")], -1, -1 )
             if self.de == "xfce":
                 self.trashButton.connect( "clicked", self.ButtonClicked, "thunar trash:" )
+            elif self.de == "mate":
+                self.trashButton.connect( "clicked", self.ButtonClicked, "caja trash:" )
             else:
                 self.trashButton.connect( "clicked", self.ButtonClicked, "xdg-open trash:" )
             self.trashButton.show()
@@ -209,7 +220,10 @@ class pluginclass( object ):
         for index in range( len(self.custompaths) ):
             path = self.custompaths[index]
             path = path.replace("~", home)
-            command = ( "xdg-open \"" + path + "\"")
+            if self.de == "mate":
+                command = ( "caja \"" + path + "\"")
+            else:
+                command = ( "xdg-open \"" + path + "\"")
             currentbutton = easyButton( "folder", self.iconsize, [self.customnames[index]], -1, -1 )
             currentbutton.connect( "clicked", self.ButtonClicked, command )
             currentbutton.show()
@@ -239,7 +253,10 @@ class pluginclass( object ):
                 
     def launch_gtk_bookmark (self, widget, path):
         self.mintMenuWin.hide()
-        os.system("xdg-open %s &" % path)        
+        if self.de == "mate":
+            os.system("caja %s &" % path)        
+        else:
+            os.system("xdg-open %s &" % path)        
 
     def trashPopup( self, widget, event ):
         if event.button == 3:
diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.py b/usr/lib/linuxmint/mintMenu/plugins/system_management.py
index 39c9dc8..ed7fef2 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/system_management.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/system_management.py
@@ -155,7 +155,10 @@ class pluginclass( object ):
 
         if ( self.showTerminal == True ):
             Button4 = easyButton( "mate-terminal", self.iconsize, [_("Terminal")], -1, -1 )
-            Button4.connect( "clicked", self.ButtonClicked, "x-terminal-emulator" )
+            if os.path.exists("/usr/bin/mate-terminal"):
+                Button4.connect( "clicked", self.ButtonClicked, "mate-terminal" )
+            else:
+                Button4.connect( "clicked", self.ButtonClicked, "x-terminal-emulator" )
             Button4.show()
             self.systemBtnHolder.pack_start( Button4, False, False )
             self.mintMenuWin.setTooltip( Button4, _("Use the command line") )