diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a7d331..1084a72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,7 @@ if(NOT(WITHOUT_TEST))
         test-src/integration/test_symlink.cpp
         test-src/integration/test_link.cpp
         test-src/integration/test_rename.cpp
+        test-src/integration/test_chmod.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 920b18b..f513452 100644
--- a/src/webfuse/provider.cpp
+++ b/src/webfuse/provider.cpp
@@ -73,6 +73,9 @@ public:
             case request_type::rename:
                 fs_rename(reader, writer);
                 break;
+            case request_type::chmod:
+                fs_chmod(reader, writer);
+                break;
             case request_type::readdir:
                 fs_readdir(reader, writer);
                 break;
@@ -147,6 +150,15 @@ private:
         writer.write_i32(result);
     }
 
+    void fs_chmod(messagereader & reader, messagewriter & writer)
+    {
+        auto const path = reader.read_str();
+        auto const mode = reader.read_mode();
+
+        auto const result = fs_.chmod(path, mode);
+        writer.write_i32(result);
+    }
+
     void fs_readdir(messagereader & reader, messagewriter & writer)
     {
         auto const path = reader.read_str();
diff --git a/test-src/integration/test_chmod.cpp b/test-src/integration/test_chmod.cpp
new file mode 100644
index 0000000..bff1fe9
--- /dev/null
+++ b/test-src/integration/test_chmod.cpp
@@ -0,0 +1,79 @@
+#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(chmod, 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, chmod("/some_file", S_IFREG | 0644)).WillOnce(Return(0));
+
+    webfuse::fixture fixture(fs);
+    auto const path = fixture.get_path() + "/some_file";
+
+    ASSERT_EQ(0, ::chmod(path.c_str(), 0644));
+}
+
+TEST(chmod, 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, chmod("/some_file", S_IFREG | 0644)).WillOnce(Return(-EACCES));
+
+    webfuse::fixture fixture(fs);
+    auto const path = fixture.get_path() + "/some_file";
+
+    ASSERT_NE(0, ::chmod(path.c_str(), 0644));
+    ASSERT_EQ(EACCES, errno);
+}