diff --git a/.gitmodules b/.gitmodules
index 6505679..df618fe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "3rdparty/bzip2"]
 	path = 3rdparty/bzip2
 	url = https://gitlab.com/bzip2/bzip2.git
+[submodule "3rdparty/lzfse"]
+	path = 3rdparty/lzfse
+	url = https://github.com/lzfse/lzfse
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index d527b97..8a82169 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -4,4 +4,7 @@ SET(ENABLE_LIB_ONLY ON)
 SET(ENABLE_STATIC_LIB ON)
 
 add_subdirectory(bzip2)
-include(lzip.cmake)
\ No newline at end of file
+include(lzip.cmake)
+
+set(LZFSE_BUNDLE_MODE ON)
+add_subdirectory(lzfse)
\ No newline at end of file
diff --git a/3rdparty/lzfse b/3rdparty/lzfse
new file mode 160000
index 0000000..e634ca5
--- /dev/null
+++ b/3rdparty/lzfse
@@ -0,0 +1 @@
+Subproject commit e634ca58b4821d9f3d560cdc6df5dec02ffc93fd
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 988ca2b..57b36c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,25 +75,25 @@ add_subdirectory(3rdparty)
 
 add_library("Aaru.Compression.Native" SHARED library.c apple_rle.c apple_rle.h adc.c adc.h lzip.c lzip.h)
 
-MACRO (TARGET_LINK_LIBRARIES_WHOLE_ARCHIVE target)
+MACRO(TARGET_LINK_LIBRARIES_WHOLE_ARCHIVE target)
     if("${CMAKE_C_COMPILER_ID}" MATCHES "MSVC")
-        FOREACH (arg IN LISTS ARGN)
+        FOREACH(arg IN LISTS ARGN)
             SET_TARGET_PROPERTIES(
                     ${target} PROPERTIES LINK_FLAGS "/WHOLEARCHIVE:${lib}"
             )
-        ENDFOREACH ()
-    ELSE ()
+        ENDFOREACH()
+    ELSE()
         if("${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang")
             SET(LINK_FLAGS "-Wl,-all_load")
             SET(UNDO_FLAGS "-Wl,-noall_load")
-        ELSE ()
+        ELSE()
             SET(LINK_FLAGS "-Wl,--whole-archive")
             SET(UNDO_FLAGS "-Wl,--no-whole-archive")
-        ENDIF ()
+        ENDIF()
         TARGET_LINK_LIBRARIES(${target} ${LINK_FLAGS} ${ARGN} ${UNDO_FLAGS})
-    ENDIF ()
-ENDMACRO ()
+    ENDIF()
+ENDMACRO()
 
-TARGET_LINK_LIBRARIES_WHOLE_ARCHIVE("Aaru.Compression.Native" bz2_static lzlib)
+TARGET_LINK_LIBRARIES_WHOLE_ARCHIVE("Aaru.Compression.Native" bz2_static lzlib lzfse)
 
 add_subdirectory(tests)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8220875..8561052 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -21,7 +21,10 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/bzip2.bz2
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/lzip.lz
      DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/data/)
 
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/lzfse.bin
+     DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/data/)
+
 # 'Google_Tests_run' is the target name
 # 'test1.cpp tests2.cpp' are source files with tests
-add_executable(tests_run apple_rle.cpp crc32.c crc32.h adc.cpp bzip2.cpp lzip.cpp)
+add_executable(tests_run apple_rle.cpp crc32.c crc32.h adc.cpp bzip2.cpp lzip.cpp lzfse.cpp)
 target_link_libraries(tests_run gtest gtest_main "Aaru.Compression.Native")
diff --git a/tests/lzfse.cpp b/tests/lzfse.cpp
new file mode 100644
index 0000000..007f5b7
--- /dev/null
+++ b/tests/lzfse.cpp
@@ -0,0 +1,76 @@
+/*
+ * This file is part of the Aaru Data Preservation Suite.
+ * Copyright (c) 2019-2021 Natalia Portillo.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of the
+ * License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <climits>
+
+#include "../3rdparty/lzfse/src/lzfse.h"
+#include "crc32.h"
+#include "gtest/gtest.h"
+
+#define EXPECTED_CRC32 0xc64059c0
+
+static const uint8_t* buffer;
+
+class lzfseFixture : public ::testing::Test
+{
+  public:
+    lzfseFixture()
+    {
+        // initialization;
+        // can also be done in SetUp()
+    }
+
+  protected:
+    void SetUp()
+    {
+        char path[PATH_MAX];
+        char filename[PATH_MAX];
+
+        getcwd(path, PATH_MAX);
+        snprintf(filename, PATH_MAX, "%s/data/lzfse.bin", path);
+
+        FILE* file = fopen(filename, "rb");
+        buffer     = (const uint8_t*)malloc(1059299);
+        fread((void*)buffer, 1, 1059299, file);
+        fclose(file);
+    }
+
+    void TearDown() { free((void*)buffer); }
+
+    ~lzfseFixture()
+    {
+        // resources cleanup, no exceptions allowed
+    }
+
+    // shared user data
+};
+
+TEST_F(lzfseFixture, lzfse)
+{
+    auto* outBuf = (uint8_t*)malloc(1048576);
+
+    auto decoded = lzfse_decode_buffer(outBuf, 1048576, buffer, 1059299, NULL);
+
+    EXPECT_EQ(decoded, 1048576);
+
+    auto crc = crc32_data(outBuf, 1048576);
+
+    free(outBuf);
+
+    EXPECT_EQ(crc, EXPECTED_CRC32);
+}