diff --git a/clone_create_ks_distributions.sh b/clone_create_ks_distributions.sh
index b036ba4..2958da5 100755
--- a/clone_create_ks_distributions.sh
+++ b/clone_create_ks_distributions.sh
@@ -67,7 +67,7 @@ then
 else
     echo "No release version passed, trying to find latest kickstart tree path"
     KSPATH=$(find /var/satellite/rhn/kickstart/ -name \
-        ks-rhel-${ARCH}-server-${RHELVERSION}* | sort -n | tail -n1)
+        ks-rhel-${ARCH}-server-${RHELVERSION}-${RHELVERSION}* | sort -n | tail -n1)
 fi
 echo_debug "spacecmd -- distribution_create -n ${CLONECH} -p ${KSPATH} \
  -b ${CLONECH} -t rhel_${RHELVERSION}"
diff --git a/clone_release_from_rhel_release.sh b/clone_release_from_rhel_release.sh
index ec3e1c1..ad06145 100755
--- a/clone_release_from_rhel_release.sh
+++ b/clone_release_from_rhel_release.sh
@@ -52,9 +52,6 @@ exit_usage()
     exit 1
 }
 
-# Source some common function definitions
-. common_functions.sh
-
 if [ $# -lt 1 ]
 then
     exit_usage
@@ -63,6 +60,9 @@ fi
 RHELVERSION=$(echo $1 | cut -d. -f1)
 UPDATE=$(echo $1 | cut -d. -f2)
 
+# Source some common function definitions
+. common_functions.sh
+
 # Base channel naming:
 # rhel-x86_64-server-5
 #  |- rhel-x86_64-server-supplementary-5