diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index 9d27d922..dad85c4d 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -29,23 +29,8 @@ do_kernel_get() {
     fi
 
     if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" ]; then
-        if [ ! -d "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" ]; then
-            # Wee need to know the custom tarball extension,
-            # so we can create a properly-named symlink, which
-            # we use later on in 'extract'
-            case "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" in
-                *.tar.bz2)      custom_name="linux-custom.tar.bz2";;
-                *.tar.gz|*.tgz) custom_name="linux-custom.tar.gz";;
-                *.tar)          custom_name="linux-custom.tar";;
-                *)  CT_Abort "Unknown extension for custom linux tarball '${CT_KERNEL_LINUX_CUSTOM_LOCATION}'";;
-            esac
-            CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_LOCATION}"  \
-                                      "${CT_TARBALLS_DIR}/${custom_name}"
-        else
-            custom_name="linux-custom"
-            CT_DoExecLog DEBUG ln -sf "${CT_KERNEL_LINUX_CUSTOM_LOCATION}"  \
-                                      "${CT_SRC_DIR}/${custom_name}"
-        fi
+        CT_GetCustom "linux" "${CT_KERNEL_VERSION}"     \
+                     "${CT_KERNEL_LINUX_CUSTOM_LOCATION}"
     else # Not a custom tarball
         case "${CT_KERNEL_VERSION}" in
             2.6.*.*|3.*.*)
@@ -74,12 +59,12 @@ do_kernel_get() {
 
 # Extract kernel
 do_kernel_extract() {
-    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" \
-         -o -d "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" ]; then
+    # If using custom headers, or custom directory location, nothing to do
+    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y"    \
+         -o -d "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" ]; then
         return 0
     fi
    
-    # This also handles the custom tarball
     CT_Extract "linux-${CT_KERNEL_VERSION}"
     CT_Patch "linux" "${CT_KERNEL_VERSION}"
 }