diff --git a/libuavcan_drivers/linux/apps/test_file_server.cpp b/libuavcan_drivers/linux/apps/test_file_server.cpp
index bf3c8ad0be..2f38dc12be 100644
--- a/libuavcan_drivers/linux/apps/test_file_server.cpp
+++ b/libuavcan_drivers/linux/apps/test_file_server.cpp
@@ -48,7 +48,7 @@ uavcan_linux::NodePtr initNode(const std::vector<std::string>& ifaces, uavcan::N
 
 void runForever(const uavcan_linux::NodePtr& node)
 {
-    uavcan_posix::BasicFileSeverBackend backend(*node);
+    uavcan_posix::BasicFileServerBackend backend(*node);
 
     uavcan::FileServer server(*node, backend);
 
diff --git a/libuavcan_drivers/posix/include/uavcan_posix/basic_file_server_backend.hpp b/libuavcan_drivers/posix/include/uavcan_posix/basic_file_server_backend.hpp
index 54fc5de6a3..772d83c102 100644
--- a/libuavcan_drivers/posix/include/uavcan_posix/basic_file_server_backend.hpp
+++ b/libuavcan_drivers/posix/include/uavcan_posix/basic_file_server_backend.hpp
@@ -31,7 +31,7 @@ namespace uavcan_posix
 /**
  * This interface implements a POSIX compliant IFileServerBackend interface
  */
-class BasicFileSeverBackend : public uavcan::IFileServerBackend
+class BasicFileServerBackend : public uavcan::IFileServerBackend
 {
     enum { FilePermissions = 438 };   ///< 0o666
 
@@ -433,12 +433,12 @@ protected:
     }
 
 public:
-    BasicFileSeverBackend(uavcan::INode& node) :
+    BasicFileServerBackend(uavcan::INode& node) :
         fdcache_(NULL),
         node_(node)
     { }
 
-    ~BasicFileSeverBackend()
+    ~BasicFileServerBackend()
     {
         if (fdcache_ != &fallback_)
         {
@@ -447,6 +447,14 @@ public:
         }
     }
 };
+
+#if __GNUC__
+/// Typo fix in a backwards-compatible way (only for GCC projects). Will be removed someday.
+typedef BasicFileServerBackend
+        BasicFileSeverBackend           // Missing 'r'
+        __attribute__((deprecated));
+#endif
+
 }
 
 #endif // Include guard