diff --git a/cpukit/libmisc/xz/COPYING b/cpukit/compression/xz/COPYING
similarity index 100%
rename from cpukit/libmisc/xz/COPYING
rename to cpukit/compression/xz/COPYING
diff --git a/cpukit/libmisc/xz/README b/cpukit/compression/xz/README
similarity index 100%
rename from cpukit/libmisc/xz/README
rename to cpukit/compression/xz/README
diff --git a/cpukit/libmisc/xz/xz_config.h b/cpukit/compression/xz/xz_config.h
similarity index 100%
rename from cpukit/libmisc/xz/xz_config.h
rename to cpukit/compression/xz/xz_config.h
diff --git a/cpukit/libmisc/xz/xz_crc32.c b/cpukit/compression/xz/xz_crc32.c
similarity index 100%
rename from cpukit/libmisc/xz/xz_crc32.c
rename to cpukit/compression/xz/xz_crc32.c
diff --git a/cpukit/libmisc/xz/xz_crc64.c b/cpukit/compression/xz/xz_crc64.c
similarity index 100%
rename from cpukit/libmisc/xz/xz_crc64.c
rename to cpukit/compression/xz/xz_crc64.c
diff --git a/cpukit/libmisc/xz/xz_dec_lzma2.c b/cpukit/compression/xz/xz_dec_lzma2.c
similarity index 100%
rename from cpukit/libmisc/xz/xz_dec_lzma2.c
rename to cpukit/compression/xz/xz_dec_lzma2.c
diff --git a/cpukit/libmisc/xz/xz_dec_stream.c b/cpukit/compression/xz/xz_dec_stream.c
similarity index 100%
rename from cpukit/libmisc/xz/xz_dec_stream.c
rename to cpukit/compression/xz/xz_dec_stream.c
diff --git a/cpukit/libmisc/xz/xz_lzma2.h b/cpukit/compression/xz/xz_lzma2.h
similarity index 100%
rename from cpukit/libmisc/xz/xz_lzma2.h
rename to cpukit/compression/xz/xz_lzma2.h
diff --git a/cpukit/libmisc/xz/xz_private.h b/cpukit/compression/xz/xz_private.h
similarity index 100%
rename from cpukit/libmisc/xz/xz_private.h
rename to cpukit/compression/xz/xz_private.h
diff --git a/cpukit/libmisc/xz/xz_stream.h b/cpukit/compression/xz/xz_stream.h
similarity index 100%
rename from cpukit/libmisc/xz/xz_stream.h
rename to cpukit/compression/xz/xz_stream.h
diff --git a/cpukit/zlib/ChangeLog.zlib b/cpukit/compression/zlib/ChangeLog.zlib
similarity index 100%
rename from cpukit/zlib/ChangeLog.zlib
rename to cpukit/compression/zlib/ChangeLog.zlib
diff --git a/cpukit/zlib/FAQ b/cpukit/compression/zlib/FAQ
similarity index 100%
rename from cpukit/zlib/FAQ
rename to cpukit/compression/zlib/FAQ
diff --git a/cpukit/zlib/README b/cpukit/compression/zlib/README
similarity index 100%
rename from cpukit/zlib/README
rename to cpukit/compression/zlib/README
diff --git a/cpukit/zlib/adler32.c b/cpukit/compression/zlib/adler32.c
similarity index 100%
rename from cpukit/zlib/adler32.c
rename to cpukit/compression/zlib/adler32.c
diff --git a/cpukit/zlib/compress.c b/cpukit/compression/zlib/compress.c
similarity index 100%
rename from cpukit/zlib/compress.c
rename to cpukit/compression/zlib/compress.c
diff --git a/cpukit/zlib/crc32.c b/cpukit/compression/zlib/crc32.c
similarity index 100%
rename from cpukit/zlib/crc32.c
rename to cpukit/compression/zlib/crc32.c
diff --git a/cpukit/zlib/crc32.h b/cpukit/compression/zlib/crc32.h
similarity index 100%
rename from cpukit/zlib/crc32.h
rename to cpukit/compression/zlib/crc32.h
diff --git a/cpukit/zlib/deflate.c b/cpukit/compression/zlib/deflate.c
similarity index 100%
rename from cpukit/zlib/deflate.c
rename to cpukit/compression/zlib/deflate.c
diff --git a/cpukit/zlib/deflate.h b/cpukit/compression/zlib/deflate.h
similarity index 100%
rename from cpukit/zlib/deflate.h
rename to cpukit/compression/zlib/deflate.h
diff --git a/cpukit/zlib/doc/algorithm.txt b/cpukit/compression/zlib/doc/algorithm.txt
similarity index 100%
rename from cpukit/zlib/doc/algorithm.txt
rename to cpukit/compression/zlib/doc/algorithm.txt
diff --git a/cpukit/zlib/doc/rfc1950.txt b/cpukit/compression/zlib/doc/rfc1950.txt
similarity index 100%
rename from cpukit/zlib/doc/rfc1950.txt
rename to cpukit/compression/zlib/doc/rfc1950.txt
diff --git a/cpukit/zlib/doc/rfc1951.txt b/cpukit/compression/zlib/doc/rfc1951.txt
similarity index 100%
rename from cpukit/zlib/doc/rfc1951.txt
rename to cpukit/compression/zlib/doc/rfc1951.txt
diff --git a/cpukit/zlib/doc/rfc1952.txt b/cpukit/compression/zlib/doc/rfc1952.txt
similarity index 100%
rename from cpukit/zlib/doc/rfc1952.txt
rename to cpukit/compression/zlib/doc/rfc1952.txt
diff --git a/cpukit/zlib/doc/txtvsbin.txt b/cpukit/compression/zlib/doc/txtvsbin.txt
similarity index 100%
rename from cpukit/zlib/doc/txtvsbin.txt
rename to cpukit/compression/zlib/doc/txtvsbin.txt
diff --git a/cpukit/zlib/gzclose.c b/cpukit/compression/zlib/gzclose.c
similarity index 100%
rename from cpukit/zlib/gzclose.c
rename to cpukit/compression/zlib/gzclose.c
diff --git a/cpukit/zlib/gzguts.h b/cpukit/compression/zlib/gzguts.h
similarity index 100%
rename from cpukit/zlib/gzguts.h
rename to cpukit/compression/zlib/gzguts.h
diff --git a/cpukit/zlib/gzlib.c b/cpukit/compression/zlib/gzlib.c
similarity index 100%
rename from cpukit/zlib/gzlib.c
rename to cpukit/compression/zlib/gzlib.c
diff --git a/cpukit/zlib/gzread.c b/cpukit/compression/zlib/gzread.c
similarity index 100%
rename from cpukit/zlib/gzread.c
rename to cpukit/compression/zlib/gzread.c
diff --git a/cpukit/zlib/gzwrite.c b/cpukit/compression/zlib/gzwrite.c
similarity index 100%
rename from cpukit/zlib/gzwrite.c
rename to cpukit/compression/zlib/gzwrite.c
diff --git a/cpukit/zlib/infback.c b/cpukit/compression/zlib/infback.c
similarity index 100%
rename from cpukit/zlib/infback.c
rename to cpukit/compression/zlib/infback.c
diff --git a/cpukit/zlib/inffast.c b/cpukit/compression/zlib/inffast.c
similarity index 100%
rename from cpukit/zlib/inffast.c
rename to cpukit/compression/zlib/inffast.c
diff --git a/cpukit/zlib/inffast.h b/cpukit/compression/zlib/inffast.h
similarity index 100%
rename from cpukit/zlib/inffast.h
rename to cpukit/compression/zlib/inffast.h
diff --git a/cpukit/zlib/inffixed.h b/cpukit/compression/zlib/inffixed.h
similarity index 100%
rename from cpukit/zlib/inffixed.h
rename to cpukit/compression/zlib/inffixed.h
diff --git a/cpukit/zlib/inflate.c b/cpukit/compression/zlib/inflate.c
similarity index 100%
rename from cpukit/zlib/inflate.c
rename to cpukit/compression/zlib/inflate.c
diff --git a/cpukit/zlib/inflate.h b/cpukit/compression/zlib/inflate.h
similarity index 100%
rename from cpukit/zlib/inflate.h
rename to cpukit/compression/zlib/inflate.h
diff --git a/cpukit/zlib/inftrees.c b/cpukit/compression/zlib/inftrees.c
similarity index 100%
rename from cpukit/zlib/inftrees.c
rename to cpukit/compression/zlib/inftrees.c
diff --git a/cpukit/zlib/inftrees.h b/cpukit/compression/zlib/inftrees.h
similarity index 100%
rename from cpukit/zlib/inftrees.h
rename to cpukit/compression/zlib/inftrees.h
diff --git a/cpukit/zlib/trees.c b/cpukit/compression/zlib/trees.c
similarity index 100%
rename from cpukit/zlib/trees.c
rename to cpukit/compression/zlib/trees.c
diff --git a/cpukit/zlib/trees.h b/cpukit/compression/zlib/trees.h
similarity index 100%
rename from cpukit/zlib/trees.h
rename to cpukit/compression/zlib/trees.h
diff --git a/cpukit/zlib/uncompr.c b/cpukit/compression/zlib/uncompr.c
similarity index 100%
rename from cpukit/zlib/uncompr.c
rename to cpukit/compression/zlib/uncompr.c
diff --git a/cpukit/zlib/zutil.c b/cpukit/compression/zlib/zutil.c
similarity index 100%
rename from cpukit/zlib/zutil.c
rename to cpukit/compression/zlib/zutil.c
diff --git a/cpukit/zlib/zutil.h b/cpukit/compression/zlib/zutil.h
similarity index 100%
rename from cpukit/zlib/zutil.h
rename to cpukit/compression/zlib/zutil.h
diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml
index a0068b1e36..0a7d849c18 100644
--- a/spec/build/cpukit/librtemscpu.yml
+++ b/spec/build/cpukit/librtemscpu.yml
@@ -526,6 +526,9 @@ links:
 - role: build-dependency
   uid: vckey
 source:
+- cpukit/compression/xz/xz_crc32.c
+- cpukit/compression/xz/xz_dec_lzma2.c
+- cpukit/compression/xz/xz_dec_stream.c
 - cpukit/dev/flash/flashdev.c
 - cpukit/dev/i2c/eeprom.c
 - cpukit/dev/i2c/fpga-i2c-slave.c
@@ -974,9 +977,6 @@ source:
 - cpukit/libmisc/uuid/unpack.c
 - cpukit/libmisc/uuid/unparse.c
 - cpukit/libmisc/uuid/uuid_time.c
-- cpukit/libmisc/xz/xz_crc32.c
-- cpukit/libmisc/xz/xz_dec_lzma2.c
-- cpukit/libmisc/xz/xz_dec_stream.c
 - cpukit/libstdthreads/call_once.c
 - cpukit/libstdthreads/cnd.c
 - cpukit/libstdthreads/mtx.c
diff --git a/spec/build/cpukit/libz.yml b/spec/build/cpukit/libz.yml
index f241b2c1dc..5f1ea57a17 100644
--- a/spec/build/cpukit/libz.yml
+++ b/spec/build/cpukit/libz.yml
@@ -15,20 +15,20 @@ install:
 install-path: ${BSP_LIBDIR}
 links: []
 source:
-- cpukit/zlib/adler32.c
-- cpukit/zlib/compress.c
-- cpukit/zlib/crc32.c
-- cpukit/zlib/deflate.c
-- cpukit/zlib/gzclose.c
-- cpukit/zlib/gzlib.c
-- cpukit/zlib/gzread.c
-- cpukit/zlib/gzwrite.c
-- cpukit/zlib/infback.c
-- cpukit/zlib/inffast.c
-- cpukit/zlib/inflate.c
-- cpukit/zlib/inftrees.c
-- cpukit/zlib/trees.c
-- cpukit/zlib/uncompr.c
-- cpukit/zlib/zutil.c
+- cpukit/compression/zlib/adler32.c
+- cpukit/compression/zlib/compress.c
+- cpukit/compression/zlib/crc32.c
+- cpukit/compression/zlib/deflate.c
+- cpukit/compression/zlib/gzclose.c
+- cpukit/compression/zlib/gzlib.c
+- cpukit/compression/zlib/gzread.c
+- cpukit/compression/zlib/gzwrite.c
+- cpukit/compression/zlib/infback.c
+- cpukit/compression/zlib/inffast.c
+- cpukit/compression/zlib/inflate.c
+- cpukit/compression/zlib/inftrees.c
+- cpukit/compression/zlib/trees.c
+- cpukit/compression/zlib/uncompr.c
+- cpukit/compression/zlib/zutil.c
 target: z
 type: build