diff --git a/plat/cpm/build-pkg.lua b/plat/cpm/build-pkg.lua
index 35c288791..0a4da3be0 100644
--- a/plat/cpm/build-pkg.lua
+++ b/plat/cpm/build-pkg.lua
@@ -19,7 +19,8 @@ installable {
 		"+tools",
 		"+libs",
         "./include+pkg",
-		["$(PLATIND)/cpm/boot.o"] = "+boot"
+		["$(PLATIND)/cpm/boot.o"] = "+boot",
+        ["$(PLATIND)/cpm/libsys.a"] = "./libsys+lib",
 	}
 }
 
diff --git a/plat/cpm/libsys/build.lua b/plat/cpm/libsys/build.lua
new file mode 100644
index 000000000..fb3a3481d
--- /dev/null
+++ b/plat/cpm/libsys/build.lua
@@ -0,0 +1,11 @@
+acklibrary {
+    name = "lib",
+    srcs = {
+        "./*.c",
+        "./*.s",
+    },
+    vars = {
+        plat = "cpm"
+    }
+}
+
diff --git a/plat/linux/liblinux/.distr b/plat/linux/libsys/.distr
similarity index 100%
rename from plat/linux/liblinux/.distr
rename to plat/linux/libsys/.distr
diff --git a/plat/linux/liblinux/_exit.c b/plat/linux/libsys/_exit.c
similarity index 100%
rename from plat/linux/liblinux/_exit.c
rename to plat/linux/libsys/_exit.c
diff --git a/plat/linux/liblinux/_hol0.s b/plat/linux/libsys/_hol0.s
similarity index 100%
rename from plat/linux/liblinux/_hol0.s
rename to plat/linux/libsys/_hol0.s
diff --git a/plat/linux/liblinux/brk.c b/plat/linux/libsys/brk.c
similarity index 100%
rename from plat/linux/liblinux/brk.c
rename to plat/linux/libsys/brk.c
diff --git a/plat/linux/liblinux/build.mk b/plat/linux/libsys/build.mk
similarity index 100%
rename from plat/linux/liblinux/build.mk
rename to plat/linux/libsys/build.mk
diff --git a/plat/linux/liblinux/close.c b/plat/linux/libsys/close.c
similarity index 100%
rename from plat/linux/liblinux/close.c
rename to plat/linux/libsys/close.c
diff --git a/plat/linux/liblinux/creat.c b/plat/linux/libsys/creat.c
similarity index 100%
rename from plat/linux/liblinux/creat.c
rename to plat/linux/libsys/creat.c
diff --git a/plat/linux/liblinux/errno.s b/plat/linux/libsys/errno.s
similarity index 100%
rename from plat/linux/liblinux/errno.s
rename to plat/linux/libsys/errno.s
diff --git a/plat/linux/liblinux/getpid.c b/plat/linux/libsys/getpid.c
similarity index 100%
rename from plat/linux/liblinux/getpid.c
rename to plat/linux/libsys/getpid.c
diff --git a/plat/linux/liblinux/gettimeofday.c b/plat/linux/libsys/gettimeofday.c
similarity index 100%
rename from plat/linux/liblinux/gettimeofday.c
rename to plat/linux/libsys/gettimeofday.c
diff --git a/plat/linux/liblinux/isatty.c b/plat/linux/libsys/isatty.c
similarity index 100%
rename from plat/linux/liblinux/isatty.c
rename to plat/linux/libsys/isatty.c
diff --git a/plat/linux/liblinux/kill.c b/plat/linux/libsys/kill.c
similarity index 100%
rename from plat/linux/liblinux/kill.c
rename to plat/linux/libsys/kill.c
diff --git a/plat/linux/liblinux/libsys.h b/plat/linux/libsys/libsys.h
similarity index 100%
rename from plat/linux/liblinux/libsys.h
rename to plat/linux/libsys/libsys.h
diff --git a/plat/linux/liblinux/lseek.c b/plat/linux/libsys/lseek.c
similarity index 100%
rename from plat/linux/liblinux/lseek.c
rename to plat/linux/libsys/lseek.c
diff --git a/plat/linux/liblinux/open.c b/plat/linux/libsys/open.c
similarity index 100%
rename from plat/linux/liblinux/open.c
rename to plat/linux/libsys/open.c
diff --git a/plat/linux/liblinux/read.c b/plat/linux/libsys/read.c
similarity index 100%
rename from plat/linux/liblinux/read.c
rename to plat/linux/libsys/read.c
diff --git a/plat/linux/liblinux/sbrk.c b/plat/linux/libsys/sbrk.c
similarity index 100%
rename from plat/linux/liblinux/sbrk.c
rename to plat/linux/libsys/sbrk.c
diff --git a/plat/linux/liblinux/signal.c b/plat/linux/libsys/signal.c
similarity index 100%
rename from plat/linux/liblinux/signal.c
rename to plat/linux/libsys/signal.c
diff --git a/plat/linux/liblinux/syscalls.h b/plat/linux/libsys/syscalls.h
similarity index 100%
rename from plat/linux/liblinux/syscalls.h
rename to plat/linux/libsys/syscalls.h
diff --git a/plat/linux/liblinux/write.c b/plat/linux/libsys/write.c
similarity index 100%
rename from plat/linux/liblinux/write.c
rename to plat/linux/libsys/write.c
diff --git a/plat/linux386/build-pkg.lua b/plat/linux386/build-pkg.lua
index 35b096f18..14251ee8a 100644
--- a/plat/linux386/build-pkg.lua
+++ b/plat/linux386/build-pkg.lua
@@ -18,7 +18,8 @@ installable {
 		"+tools",
 		"+libs",
 		"./include+pkg",
-		["$(PLATIND)/linux386/boot.o"] = "+boot"
+		["$(PLATIND)/linux386/boot.o"] = "+boot",
+        ["$(PLATIND)/linux386/libsys.a"] = "./libsys+lib",
 	}
 }
 
diff --git a/plat/linux386/descr b/plat/linux386/descr
index 3bdd9d768..7fa809058 100644
--- a/plat/linux386/descr
+++ b/plat/linux386/descr
@@ -67,8 +67,7 @@ name led
 		(.ocm:{TAIL}={PLATFORMDIR}/liboccam.a) \
 		(.ocm.b.mod.c.p:{TAIL}={PLATFORMDIR}/libc.a) \
 		{FLOATS?} \
-		(.e:{TAIL}={PLATFORMDIR}/liblinux.a \
-		           {PLATFORMDIR}/libem.a \
+		(.e:{TAIL}={PLATFORMDIR}/libem.a \
 		           {PLATFORMDIR}/liblinux.a \
 		           {PLATFORMDIR}/libsys.a \
 		           {PLATFORMDIR}/libend.a)
diff --git a/plat/linux386/libsys/build.lua b/plat/linux386/libsys/build.lua
new file mode 100644
index 000000000..9608aab7b
--- /dev/null
+++ b/plat/linux386/libsys/build.lua
@@ -0,0 +1,12 @@
+acklibrary {
+    name = "lib",
+    srcs = {
+        "./*.s",
+        "plat/linux/libsys/*.c",
+        "plat/linux/libsys/*.s",
+    },
+    vars = {
+        plat = "linux386"
+    }
+}
+
diff --git a/plat/pc86/build-pkg.lua b/plat/pc86/build-pkg.lua
index f0f1653d5..b4ff7b767 100644
--- a/plat/pc86/build-pkg.lua
+++ b/plat/pc86/build-pkg.lua
@@ -18,7 +18,8 @@ installable {
 		"+tools",
 		"+libs",
         "./include+pkg",
-		["$(PLATIND)/pc86/boot.o"] = "+boot"
+		["$(PLATIND)/pc86/boot.o"] = "+boot",
+        ["$(PLATIND)/pc86/libsys.a"] = "./libsys+lib",
 	}
 }
 
diff --git a/plat/pc86/libsys/build.lua b/plat/pc86/libsys/build.lua
new file mode 100644
index 000000000..909b02930
--- /dev/null
+++ b/plat/pc86/libsys/build.lua
@@ -0,0 +1,11 @@
+acklibrary {
+    name = "lib",
+    srcs = {
+        "./*.c",
+        "./*.s",
+    },
+    vars = {
+        plat = "pc86"
+    }
+}
+