diff --git a/hwpack/am57xx-beagle-x15.conf b/hwpack/am57xx-beagle-x15.conf
index 01d3e68..dcd06e0 100644
--- a/hwpack/am57xx-beagle-x15.conf
+++ b/hwpack/am57xx-beagle-x15.conf
@@ -35,6 +35,5 @@ kernel_repo="STABLE"
 dtb=
 usbnet_mem=""
 
-SERIAL="ttyO2"
+SERIAL="ttyS2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
-di_serial_mode="enable"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index ef9397e..71fe528 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2009-2014 Robert Nelson <robertcnelson@gmail.com>
+# Copyright (c) 2009-2015 Robert Nelson <robertcnelson@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
 #REQUIREMENTS:
 #uEnv.txt bootscript support
 
-MIRROR="https://rcn-ee.net/deb"
+MIRROR="https://repos.rcn-ee.net"
 
 BOOT_LABEL="BOOT"
 PARTITION_PREFIX=""
@@ -207,22 +207,14 @@ dl_kernel_image () {
 	fi
 
 	if [ ! "${KERNEL_DEB}" ] ; then
-		${dl_quiet} --directory-prefix=${TEMPDIR}/dl/ ${MIRROR}/${DISTARCH}/LATEST-${kernel_subarch}
+		${dl_quiet} --directory-prefix=${TEMPDIR}/dl/ ${MIRROR}/latest/${DISTARCH}/LATEST-${kernel_subarch}
 
 		FTP_DIR=$(cat ${TEMPDIR}/dl/LATEST-${kernel_subarch} | grep "ABI:1 ${kernel_repo}" | awk '{print $3}')
+		uname_r="${FTP_DIR}"
 
-		FTP_DIR=$(echo ${FTP_DIR} | awk -F'/' '{print $6}')
+		ACTUAL_DEB_FILE=linux-image-${uname_r}_1${DIST}_${ARCH}.deb
 
-		KERNEL=$(echo ${FTP_DIR} | sed 's/v//')
-		uname_r="${KERNEL}"
-
-		${dl_quiet} --directory-prefix=${TEMPDIR}/dl/ ${MIRROR}/${DISTARCH}/${FTP_DIR}/
-		ACTUAL_DEB_FILE=$(cat ${TEMPDIR}/dl/index.html | grep linux-image)
-		ACTUAL_DEB_FILE=$(echo ${ACTUAL_DEB_FILE} | awk -F ".deb" '{print $1}')
-		ACTUAL_DEB_FILE=${ACTUAL_DEB_FILE##*linux-image-}
-		ACTUAL_DEB_FILE="linux-image-${ACTUAL_DEB_FILE}.deb"
-
-		${dl_continue} --directory-prefix="${DIR}/dl/${DISTARCH}" ${MIRROR}/${DISTARCH}/v${KERNEL}/${ACTUAL_DEB_FILE}
+		${dl_continue} --directory-prefix="${DIR}/dl/${DISTARCH}" ${MIRROR}/${deb_distribution}/pool/main/l/linux-upstream/${ACTUAL_DEB_FILE}
 
 	else