diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 078cf24..f6a82df 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -39,6 +39,10 @@
     <method name='CreateFolder'>
       <arg type='s' name='URI' direction='in'/>
     </method>
+    <method name='RenameFile'>
+      <arg type='s' name='URI' direction='in'/>
+      <arg type='s' name='NewName' direction='in'/>
+    </method>
     <method name='Undo'>
     </method>
     <method name='Redo'>
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 64f004d..7185256 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -27,6 +27,7 @@
 
 #include "nautilus-file-operations.h"
 #include "nautilus-file-undo-manager.h"
+#include "nautilus-file.h"
 
 #define DEBUG_FLAG NAUTILUS_DEBUG_DBUS
 #include "nautilus-debug.h"
@@ -237,6 +238,34 @@ handle_trash_files (NautilusDBusFileOperations  *object,
     return TRUE; /* invocation was handled */
 }
 
+static void
+rename_file_on_finished (NautilusFile *file,
+                         GFile        *result_location,
+                         GError       *error,
+                         gpointer      callback_data)
+{
+    g_application_release (g_application_get_default ());
+}
+
+static gboolean
+handle_rename_file (NautilusDBusFileOperations *object,
+                    GDBusMethodInvocation      *invocation,
+                    const gchar                *uri,
+                    const gchar                *new_name)
+{
+    NautilusFile *file = NULL;
+
+    file = nautilus_file_get_by_uri (uri);
+
+    g_application_hold (g_application_get_default ());
+    nautilus_file_rename (file, new_name,
+                          rename_file_on_finished, NULL);
+
+    nautilus_dbus_file_operations_complete_rename_file (object, invocation);
+
+    return TRUE; /* invocation was handled */
+}
+
 
 static void
 undo_manager_changed (NautilusDBusManager *self)
@@ -274,6 +303,10 @@ nautilus_dbus_manager_init (NautilusDBusManager *self)
                       G_CALLBACK (handle_create_folder),
                       self);
     g_signal_connect (self->file_operations,
+                      "handle-rename-file",
+                      G_CALLBACK (handle_rename_file),
+                      self);
+    g_signal_connect (self->file_operations,
                       "handle-undo",
                       G_CALLBACK (handle_undo),
                       self);