diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c4c59d8de..5a2c6e36a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -95,6 +95,8 @@ jobs:
           # This job is only for testing R3BRoot without downloading any
           # dependencies.
           - repos: r3broot
+          # The R3BFileSource repo is used for testing unpacking.
+            url: https://github.com/R3BRootGroup/R3BFileSource.git
             cache: r3broot
           # The job for testing with glad-tpc
           - repos: glad-tpc
@@ -107,10 +109,12 @@ jobs:
             # If more than one repos needs to be downloaded in a job. "url" needs
             # to be a space separated list of urls using the operator ">-". Append
             # more urls to this list if more repos need to be added.
+            # The R3BFileSource repo is used for testing unpacking.
             url: >-
               https://github.com/R3BRootGroup/sofia.git
               https://github.com/R3BRootGroup/frs.git
               https://github.com/R3BRootGroup/asyeos.git
+              https://github.com/R3BRootGroup/R3BFileSource.git
             # Using own cache file
             cache: other-repos
 
diff --git a/.gitignore b/.gitignore
index 205dbef39..56a00ddae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ glad-tpc/
 frs/
 asyeos/
 R3BParams_*/
+R3BFileSource/
 
 # Generated folders and files 
 geometry/neuland_v*.root
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d48ce4d96..7105e5191 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -554,6 +554,9 @@ if(NOT MODULE)
     if(WITH_ASYEOS)
         add_subdirectory(asyeos)
     endif(WITH_ASYEOS)
+    if(EXISTS "${PROJECT_SOURCE_DIR}/R3BFileSource")
+        add_subdirectory(R3BFileSource)
+    endif(EXISTS "${PROJECT_SOURCE_DIR}/R3BFileSource")
     if(EXISTS "${PROJECT_SOURCE_DIR}/macros")
         add_subdirectory(macros)
     endif(EXISTS "${PROJECT_SOURCE_DIR}/macros")