diff --git a/pkg/initrd/build b/pkg/initrd/build
index 6780fce..2d235e7 100755
--- a/pkg/initrd/build
+++ b/pkg/initrd/build
@@ -1,35 +1,25 @@
 DEPENDS="bbstatic"
 
 build() {
-	return
+	local INPUT="$1"
+	local DEPLOY="$2"
+
+	mkdir -p ./{dev,lib,bin,sys,proc,newroot,images}
+
+	pkg install -omLD -r "$PKGBUILDDIR" -R "$REPODIR" $DEPENDS
 }
 
 deploy() {
 	local INPUT="$1"
 	local DEPLOY="$2"
 
-	cp "$SCRIPTDIR/pkg/initrd/initrd.skel" "$DEPLOY/init"
-	chmod +x "$DEPLOY/init"
+	cp $SCRIPTDIR/pkg/initrd/*.{desc,files} "$DEPLOY"
 
-	mkdir -p $DEPLOY/{dev,lib,bin,sys,proc,newroot,images}
+	pkg install -R "$REPODIR" -r "$PKGBUILDDIR" -l -F pkg $DEPENDS \
+	    >> "$DEPLOY/initrd.files"
 
-cat > "$DEPLOY/initrd.list" <<_EOF
-dir /dev 0755 0 0
-dir /lib 0775 0 0
-dir /bin 0775 0 0
-dir /sys 0775 0 0
-dir /proc 0775 0 0
-dir /newroot 0775 0 0
-dir /images 0775 0 0
-slink /sbin /bin 0777 0 0
-nod /dev/console 600 0 0 c 5 1
-file /init $DEPLOY/init 0775 0 0
-_EOF
-
-	pkg install -om -R "$REPODIR" -r "$DEPLOY" $DEPENDS
-
-	pkg install -R "$REPODIR" -r "$DEPLOY" -l \
-	    -F initrd $DEPENDS >> "$DEPLOY/initrd.list"
+	echo "file init 0775 0 0 $SCRIPTDIR/pkg/$PKGNAME/initrd.skel" \
+	     >> "$DEPLOY/initrd.files"
 }
 
 check_update() {
diff --git a/pkg/initrd/initrd.desc b/pkg/initrd/initrd.desc
new file mode 100644
index 0000000..87cedee
--- /dev/null
+++ b/pkg/initrd/initrd.desc
@@ -0,0 +1 @@
+name initrd
diff --git a/pkg/initrd/initrd.files b/pkg/initrd/initrd.files
new file mode 100644
index 0000000..d617053
--- /dev/null
+++ b/pkg/initrd/initrd.files
@@ -0,0 +1,9 @@
+dir dev 0755 0 0
+dir lib 0775 0 0
+dir bin 0775 0 0
+dir sys 0775 0 0
+dir proc 0775 0 0
+dir newroot 0775 0 0
+dir images 0775 0 0
+slink sbin 0777 0 0 bin
+nod dev/console 600 0 0 c 5 1
diff --git a/pkg/linux/build b/pkg/linux/build
index 9cfc315..9fef23c 100755
--- a/pkg/linux/build
+++ b/pkg/linux/build
@@ -32,9 +32,16 @@ prepare() {
 }
 
 build() {
-	local INITRDLIST="$PKGDEPLOYDIR/initrd/initrd.list"
+	local SOURCE="$1"
+	local DEPLOY="$2"
+
+	local INITRDDIR="$DEPLOY/initrd"
+	local INITRDLIST="$INITRDDIR/initrd.list"
 	local LINUX_CPU=$(get_linux_cpu)
 
+	pkg install -omLD -R "$REPODIR" -r "$INITRDDIR" initrd
+	pkg install -R "$REPODIR" -r "$INITRDDIR" -l -F initrd initrd > "$INITRDLIST"
+
 	export KBUILD_OUTPUT="$PKGBUILDDIR"
 
 	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" mrproper
@@ -44,6 +51,8 @@ build() {
 	sed -i "$PKGBUILDDIR/.config" -e 's,^CONFIG_LOCALVERSION=.*,CONFIG_LOCALVERSION="-'${OS_NAME}-${OS_RELEASE}'",'
 	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" oldconfig
 	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" -j $NUMJOBS $LINUX_TGT
+
+	rm -rf "$INITRDDIR"
 }
 
 deploy() {