diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebdfe8a..3a7d331 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,7 @@ if(NOT(WITHOUT_TEST))
         test-src/integration/test_readlink.cpp
         test-src/integration/test_symlink.cpp
         test-src/integration/test_link.cpp
+        test-src/integration/test_rename.cpp
     )
 
     target_include_directories(integration_tests PRIVATE test-src/integration ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS})
diff --git a/src/webfuse/provider.cpp b/src/webfuse/provider.cpp
index b457f25..920b18b 100644
--- a/src/webfuse/provider.cpp
+++ b/src/webfuse/provider.cpp
@@ -70,6 +70,9 @@ public:
             case request_type::link:
                 fs_link(reader, writer);
                 break;
+            case request_type::rename:
+                fs_rename(reader, writer);
+                break;
             case request_type::readdir:
                 fs_readdir(reader, writer);
                 break;
@@ -134,6 +137,16 @@ private:
         writer.write_i32(result);
     }
 
+    void fs_rename(messagereader & reader, messagewriter & writer)
+    {
+        auto const from = reader.read_str();
+        auto const to = reader.read_str();
+        auto const flags = reader.read_u8();
+
+        auto const result = fs_.rename(from, to, flags);
+        writer.write_i32(result);
+    }
+
     void fs_readdir(messagereader & reader, messagewriter & writer)
     {
         auto const path = reader.read_str();
diff --git a/test-src/integration/test_rename.cpp b/test-src/integration/test_rename.cpp
new file mode 100644
index 0000000..d944c99
--- /dev/null
+++ b/test-src/integration/test_rename.cpp
@@ -0,0 +1,81 @@
+#include "webfuse/webfuse.hpp"
+#include "webfuse/test/fixture.hpp"
+#include "webfuse/test/filesystem_mock.hpp"
+
+#include <gtest/gtest.h>
+
+using testing::_;
+using testing::Return;
+using testing::Invoke;
+using testing::AnyNumber;
+
+TEST(rename, success)
+{
+    bool link_created = false;
+
+    webfuse::filesystem_mock fs;
+    EXPECT_CALL(fs, access("/",_)).Times(AnyNumber()).WillRepeatedly(Return(0));
+    EXPECT_CALL(fs, getattr(_,_)).WillRepeatedly(Invoke([&link_created](std::string const & path, struct stat * attr){
+        memset(reinterpret_cast<void*>(attr),0, sizeof(struct stat));
+
+        if (path == "/")
+        {
+            attr->st_nlink = 1;
+            attr->st_mode = S_IFDIR | 0755;
+            return 0;
+        }
+        if (path == "/some_file")
+        {
+            attr->st_nlink = 1;
+            attr->st_mode = S_IFREG | 0755;
+            return 0;
+        }
+        else
+        {
+            return -ENOENT;
+        }
+    }));
+    EXPECT_CALL(fs, rename("/some_file", "/another_file", _)).WillOnce(Return(0));
+
+    webfuse::fixture fixture(fs);
+    auto const old_name = fixture.get_path() + "/some_file";
+    auto const new_name = fixture.get_path() + "/another_file";
+
+    ASSERT_EQ(0, ::rename(old_name.c_str(), new_name.c_str()));
+}
+
+TEST(rename, fail)
+{
+    bool link_created = false;
+
+    webfuse::filesystem_mock fs;
+    EXPECT_CALL(fs, access("/",_)).Times(AnyNumber()).WillRepeatedly(Return(0));
+    EXPECT_CALL(fs, getattr(_,_)).WillRepeatedly(Invoke([&link_created](std::string const & path, struct stat * attr){
+        memset(reinterpret_cast<void*>(attr),0, sizeof(struct stat));
+
+        if (path == "/")
+        {
+            attr->st_nlink = 1;
+            attr->st_mode = S_IFDIR | 0755;
+            return 0;
+        }
+        if (path == "/some_file")
+        {
+            attr->st_nlink = 1;
+            attr->st_mode = S_IFREG | 0755;
+            return 0;
+        }
+        else
+        {
+            return -ENOENT;
+        }
+    }));
+    EXPECT_CALL(fs, rename("/some_file", "/another_file", _)).WillOnce(Return(-EDQUOT));
+
+    webfuse::fixture fixture(fs);
+    auto const old_name = fixture.get_path() + "/some_file";
+    auto const new_name = fixture.get_path() + "/another_file";
+
+    ASSERT_NE(0, ::rename(old_name.c_str(), new_name.c_str()));
+    ASSERT_EQ(EDQUOT, errno);
+}