diff --git a/archival/Kbuild.src b/archival/Kbuild.src
index a0edb123d..e49d38538 100644
--- a/archival/Kbuild.src
+++ b/archival/Kbuild.src
@@ -19,8 +19,7 @@ lib-$(CONFIG_RPM)		+= rpm.o
 lib-$(CONFIG_TAR)		+= tar.o
 lib-$(CONFIG_UNZIP)		+= unzip.o
 
-lib-$(CONFIG_LZOP)		+= lzop.o lzo1x_1.o lzo1x_1o.o lzo1x_d.o bbunzip.o
-lib-$(CONFIG_LZOP_COMPR_HIGH)	+= lzo1x_9x.o
+lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
 lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
 lib-$(CONFIG_BZIP2)		+= bzip2.o bbunzip.o
 
diff --git a/archival/libunarchive/Kbuild.src b/archival/libunarchive/Kbuild.src
index e92b4aad2..b0bc4e5aa 100644
--- a/archival/libunarchive/Kbuild.src
+++ b/archival/libunarchive/Kbuild.src
@@ -48,6 +48,8 @@ lib-$(CONFIG_RPM)                       += open_transformer.o decompress_unzip.o
 lib-$(CONFIG_TAR)                       += get_header_tar.o
 lib-$(CONFIG_UNCOMPRESS)                += decompress_uncompress.o
 lib-$(CONFIG_UNZIP)                     += decompress_unzip.o
+lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
+lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
 lib-$(CONFIG_FEATURE_SEAMLESS_Z)        += open_transformer.o decompress_uncompress.o
 lib-$(CONFIG_FEATURE_SEAMLESS_GZ)       += open_transformer.o decompress_unzip.o get_header_tar_gz.o
 lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o get_header_tar_bz2.o
diff --git a/archival/liblzo.h b/archival/libunarchive/liblzo.h
similarity index 100%
rename from archival/liblzo.h
rename to archival/libunarchive/liblzo.h
diff --git a/archival/lzo1x_1.c b/archival/libunarchive/lzo1x_1.c
similarity index 100%
rename from archival/lzo1x_1.c
rename to archival/libunarchive/lzo1x_1.c
diff --git a/archival/lzo1x_1o.c b/archival/libunarchive/lzo1x_1o.c
similarity index 100%
rename from archival/lzo1x_1o.c
rename to archival/libunarchive/lzo1x_1o.c
diff --git a/archival/lzo1x_9x.c b/archival/libunarchive/lzo1x_9x.c
similarity index 100%
rename from archival/lzo1x_9x.c
rename to archival/libunarchive/lzo1x_9x.c
diff --git a/archival/lzo1x_c.c b/archival/libunarchive/lzo1x_c.c
similarity index 100%
rename from archival/lzo1x_c.c
rename to archival/libunarchive/lzo1x_c.c
diff --git a/archival/lzo1x_d.c b/archival/libunarchive/lzo1x_d.c
similarity index 100%
rename from archival/lzo1x_d.c
rename to archival/libunarchive/lzo1x_d.c
diff --git a/archival/liblzo_interface.h b/include/liblzo_interface.h
similarity index 100%
rename from archival/liblzo_interface.h
rename to include/liblzo_interface.h