diff --git a/contrib/README.md b/contrib/README.md
index 33959aecb5..5347e57418 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -57,3 +57,4 @@ Git log in order to find out version and update details
 | cpukit/libz                           | https://github.com/madler/zlib                                 |
 | cpukit/uuid                           | https://github.com/tytso/e2fsprogs/tree/master/lib/uuid        |
 | cpukit/xz-embedded                    | https://github.com/tukaani-project/xz-embedded                 |
+| cpukit/jffs2                          | https://github.com/torvalds/linux                              |
diff --git a/cpukit/libfs/src/jffs2/README.md b/contrib/cpukit/jffs2/README.md
similarity index 87%
rename from cpukit/libfs/src/jffs2/README.md
rename to contrib/cpukit/jffs2/README.md
index da391a2c7a..8348eae6ad 100644
--- a/cpukit/libfs/src/jffs2/README.md
+++ b/contrib/cpukit/jffs2/README.md
@@ -9,7 +9,6 @@ generate the relevant patches:
 ```shell
   git format-patch v6.1..v9.99 -- \
     include/uapi/linux/jffs2.h \
-    fs/jffs2/LICENCE \
     fs/jffs2/acl.h \
     fs/jffs2/build.c \
     fs/jffs2/compr.c \
@@ -40,6 +39,6 @@ generate the relevant patches:
 The patches need a transformation of file paths from Linux to RTEMS:
 
 ```shell
-  sed -i 's%/include/uapi%/cpukit/libfs/src/jffs2/include%g' 00*
-  sed -i 's%/fs/jffs2%/cpukit/libfs/src/jffs2/src%g' 00*
+  sed -i 's%/include/uapi%/contrib/cpukit/jffs2/include%g' 00*
+  sed -i 's%/fs/jffs2%/contrib/cpukit/jffs2%g' 00*
 ```
diff --git a/cpukit/libfs/src/jffs2/src/acl.h b/contrib/cpukit/jffs2/acl.h
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/acl.h
rename to contrib/cpukit/jffs2/acl.h
diff --git a/cpukit/libfs/src/jffs2/src/build.c b/contrib/cpukit/jffs2/build.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/build.c
rename to contrib/cpukit/jffs2/build.c
diff --git a/cpukit/libfs/src/jffs2/src/compr.c b/contrib/cpukit/jffs2/compr.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/compr.c
rename to contrib/cpukit/jffs2/compr.c
diff --git a/cpukit/libfs/src/jffs2/src/compr.h b/contrib/cpukit/jffs2/compr.h
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/compr.h
rename to contrib/cpukit/jffs2/compr.h
diff --git a/cpukit/libfs/src/jffs2/src/compr_rtime.c b/contrib/cpukit/jffs2/compr_rtime.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/compr_rtime.c
rename to contrib/cpukit/jffs2/compr_rtime.c
diff --git a/cpukit/libfs/src/jffs2/src/compr_rubin.c b/contrib/cpukit/jffs2/compr_rubin.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/compr_rubin.c
rename to contrib/cpukit/jffs2/compr_rubin.c
diff --git a/cpukit/libfs/src/jffs2/src/compr_zlib.c b/contrib/cpukit/jffs2/compr_zlib.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/compr_zlib.c
rename to contrib/cpukit/jffs2/compr_zlib.c
diff --git a/cpukit/libfs/src/jffs2/src/debug.c b/contrib/cpukit/jffs2/debug.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/debug.c
rename to contrib/cpukit/jffs2/debug.c
diff --git a/cpukit/libfs/src/jffs2/src/debug.h b/contrib/cpukit/jffs2/debug.h
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/debug.h
rename to contrib/cpukit/jffs2/debug.h
diff --git a/cpukit/libfs/src/jffs2/src/erase.c b/contrib/cpukit/jffs2/erase.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/erase.c
rename to contrib/cpukit/jffs2/erase.c
diff --git a/cpukit/libfs/src/jffs2/src/gc.c b/contrib/cpukit/jffs2/gc.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/gc.c
rename to contrib/cpukit/jffs2/gc.c
diff --git a/cpukit/libfs/src/jffs2/include/linux/jffs2.h b/contrib/cpukit/jffs2/include/linux/jffs2.h
similarity index 100%
rename from cpukit/libfs/src/jffs2/include/linux/jffs2.h
rename to contrib/cpukit/jffs2/include/linux/jffs2.h
diff --git a/cpukit/libfs/src/jffs2/src/jffs2_fs_i.h b/contrib/cpukit/jffs2/jffs2_fs_i.h
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/jffs2_fs_i.h
rename to contrib/cpukit/jffs2/jffs2_fs_i.h
diff --git a/cpukit/libfs/src/jffs2/src/jffs2_fs_sb.h b/contrib/cpukit/jffs2/jffs2_fs_sb.h
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/jffs2_fs_sb.h
rename to contrib/cpukit/jffs2/jffs2_fs_sb.h
diff --git a/cpukit/libfs/src/jffs2/src/nodelist.c b/contrib/cpukit/jffs2/nodelist.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/nodelist.c
rename to contrib/cpukit/jffs2/nodelist.c
diff --git a/cpukit/libfs/src/jffs2/src/nodelist.h b/contrib/cpukit/jffs2/nodelist.h
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/nodelist.h
rename to contrib/cpukit/jffs2/nodelist.h
diff --git a/cpukit/libfs/src/jffs2/src/nodemgmt.c b/contrib/cpukit/jffs2/nodemgmt.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/nodemgmt.c
rename to contrib/cpukit/jffs2/nodemgmt.c
diff --git a/cpukit/libfs/src/jffs2/src/read.c b/contrib/cpukit/jffs2/read.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/read.c
rename to contrib/cpukit/jffs2/read.c
diff --git a/cpukit/libfs/src/jffs2/src/readinode.c b/contrib/cpukit/jffs2/readinode.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/readinode.c
rename to contrib/cpukit/jffs2/readinode.c
diff --git a/cpukit/libfs/src/jffs2/src/scan.c b/contrib/cpukit/jffs2/scan.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/scan.c
rename to contrib/cpukit/jffs2/scan.c
diff --git a/cpukit/libfs/src/jffs2/src/summary.c b/contrib/cpukit/jffs2/summary.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/summary.c
rename to contrib/cpukit/jffs2/summary.c
diff --git a/cpukit/libfs/src/jffs2/src/summary.h b/contrib/cpukit/jffs2/summary.h
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/summary.h
rename to contrib/cpukit/jffs2/summary.h
diff --git a/cpukit/libfs/src/jffs2/src/wbuf.c b/contrib/cpukit/jffs2/wbuf.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/wbuf.c
rename to contrib/cpukit/jffs2/wbuf.c
diff --git a/cpukit/libfs/src/jffs2/src/write.c b/contrib/cpukit/jffs2/write.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/write.c
rename to contrib/cpukit/jffs2/write.c
diff --git a/cpukit/libfs/src/jffs2/src/writev.c b/contrib/cpukit/jffs2/writev.c
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/writev.c
rename to contrib/cpukit/jffs2/writev.c
diff --git a/cpukit/libfs/src/jffs2/src/xattr.h b/contrib/cpukit/jffs2/xattr.h
similarity index 100%
rename from cpukit/libfs/src/jffs2/src/xattr.h
rename to contrib/cpukit/jffs2/xattr.h
diff --git a/spec/build/cpukit/libjffs2.yml b/spec/build/cpukit/libjffs2.yml
index 0acf36dc49..18cd6bad59 100644
--- a/spec/build/cpukit/libjffs2.yml
+++ b/spec/build/cpukit/libjffs2.yml
@@ -2,7 +2,6 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 build-type: library
 cflags:
 - ${COVERAGE_COMPILER_FLAGS}
-- -Wno-pointer-sign
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH & Co. KG
 cppflags: []
@@ -11,6 +10,9 @@ cxxflags:
 enabled-by: true
 includes:
 - cpukit/libfs/src/jffs2/include
+- cpukit/libfs/src/jffs2/src
+- contrib/cpukit/jffs2/include
+- contrib/cpukit/jffs2
 - contrib/cpukit/zlib
 install:
 - destination: ${BSP_INCLUDEDIR}/rtems
@@ -18,27 +20,14 @@ install:
   - cpukit/include/rtems/jffs2.h
 install-path: ${BSP_LIBDIR}
 links:
+- role: build-dependency
+  uid: objjffs2contrib
 - role: build-dependency
   uid: objjffs2summary
 source:
-- cpukit/libfs/src/jffs2/src/build.c
-- cpukit/libfs/src/jffs2/src/compr.c
-- cpukit/libfs/src/jffs2/src/compr_rtime.c
-- cpukit/libfs/src/jffs2/src/compr_zlib.c
-- cpukit/libfs/src/jffs2/src/debug.c
 - cpukit/libfs/src/jffs2/src/dir-rtems.c
-- cpukit/libfs/src/jffs2/src/erase.c
 - cpukit/libfs/src/jffs2/src/flashio.c
 - cpukit/libfs/src/jffs2/src/fs-rtems.c
-- cpukit/libfs/src/jffs2/src/gc.c
 - cpukit/libfs/src/jffs2/src/malloc-rtems.c
-- cpukit/libfs/src/jffs2/src/nodelist.c
-- cpukit/libfs/src/jffs2/src/nodemgmt.c
-- cpukit/libfs/src/jffs2/src/read.c
-- cpukit/libfs/src/jffs2/src/readinode.c
-- cpukit/libfs/src/jffs2/src/scan.c
-- cpukit/libfs/src/jffs2/src/wbuf.c
-- cpukit/libfs/src/jffs2/src/write.c
-- cpukit/libfs/src/jffs2/src/writev.c
 target: jffs2
 type: build
diff --git a/spec/build/cpukit/objjffs2contrib.yml b/spec/build/cpukit/objjffs2contrib.yml
new file mode 100644
index 0000000000..f730e80d10
--- /dev/null
+++ b/spec/build/cpukit/objjffs2contrib.yml
@@ -0,0 +1,33 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: objects
+cflags:
+- ${COVERAGE_COMPILER_FLAGS}
+- -Wno-pointer-sign
+copyrights:
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+cppflags: []
+cxxflags:
+- ${COVERAGE_COMPILER_FLAGS}
+enabled-by: true
+includes:
+- contrib/cpukit/jffs2/include
+- contrib/cpukit/zlib
+install: []
+links: []
+source:
+- contrib/cpukit/jffs2/build.c
+- contrib/cpukit/jffs2/compr.c
+- contrib/cpukit/jffs2/compr_rtime.c
+- contrib/cpukit/jffs2/compr_zlib.c
+- contrib/cpukit/jffs2/debug.c
+- contrib/cpukit/jffs2/erase.c
+- contrib/cpukit/jffs2/gc.c
+- contrib/cpukit/jffs2/nodelist.c
+- contrib/cpukit/jffs2/nodemgmt.c
+- contrib/cpukit/jffs2/read.c
+- contrib/cpukit/jffs2/readinode.c
+- contrib/cpukit/jffs2/scan.c
+- contrib/cpukit/jffs2/wbuf.c
+- contrib/cpukit/jffs2/write.c
+- contrib/cpukit/jffs2/writev.c
+type: build
diff --git a/spec/build/cpukit/objjffs2summary.yml b/spec/build/cpukit/objjffs2summary.yml
index 46f7a04ceb..961159f0a2 100644
--- a/spec/build/cpukit/objjffs2summary.yml
+++ b/spec/build/cpukit/objjffs2summary.yml
@@ -11,5 +11,5 @@ includes: []
 install: []
 links: []
 source:
-- cpukit/libfs/src/jffs2/src/summary.c
+- contrib/cpukit/jffs2/summary.c
 type: build