diff --git a/scripts/kernel-functions b/scripts/kernel-functions
index a72230dc7..cf9c1bf20 100644
--- a/scripts/kernel-functions
+++ b/scripts/kernel-functions
@@ -53,9 +53,9 @@ function download_kernel {
   test -w "${kernel_sources}" || return $?
   (
     cd "${kernel_sources}" || return $?
-    if [ "$plevel" = "" ] \
-       || download_file "${kernel_mirror}/v$series/patch-$1.xz" \
-       || download_file "${kernel_mirror}/v$series/longterm/v${kver}/patch-$1.xz"
+    if [ "$plevel" = "" -o "$plevel" = "0" ] ||
+       download_file "${kernel_mirror}/v$series/patch-$1.xz" ||
+       download_file "${kernel_mirror}/v$series/longterm/v${kver}/patch-$1.xz"
     then
       download_file "${kernel_mirror}/v$series/linux-${kver}.tar.xz" \
         || download_file "${kernel_mirror}/v$series/longterm/v${kver}/linux-${kver}.tar.xz" \
@@ -87,14 +87,16 @@ function extract_kernel_tree {
   mkdir "${tmpdir}" || return $?
   (
     cd "${tmpdir}" || return $?
-    if [ "$plevel" != "" -a -e "${kernel_sources}/patch-$1.xz" ]; then
+    if [ "$plevel" != "" -a "$plevel" != "0" -a \
+         -e "${kernel_sources}/patch-$1.xz" ]; then
       extract_kernel_archive $kver || return $?
       mv linux-$kver linux-$1
       ( cd linux-$1 && xz -cd "${kernel_sources}/patch-$1.xz" \
         | patch -p1 -f -s; ) \
         || return $?
     else
-      extract_kernel_archive $1 || return $?
+      extract_kernel_archive $kver || return $?
+      mv linux-$kver linux-$1
     fi
     mv "linux-$1" ".." || return $?
     cd "../linux-$1" || return $?