diff --git a/target/router/build.sh b/target/router/build.sh
index fa829dd8d..e035b703a 100644
--- a/target/router/build.sh
+++ b/target/router/build.sh
@@ -32,7 +32,7 @@ do
 		echo_error "Did not find program binary for '$x'."
 done
 
-for x in iproute2 iptables grub pppd
+for x in iproute2 iptables grub ppp
 do
 	echo_status "Copy entire $x package."
 	while read dummy fn
@@ -47,7 +47,7 @@ for x in $( ls initrd/bin/ )
 do
 	while read a b c d
 	do
-		[ "$b" = "=>" ] && \
+		[ "$b" = "=>" ] && [ -n "$d" ] && \
 			cp $build_root/${c#/} initrd/lib/
 	done < <( chroot $build_root /bin/bash -c \
 					"cd /; ldd \`type -p $x\`"; )
@@ -88,8 +88,19 @@ cp $build_root/sbin/{hwscan,dumpnetcfg} initrd/bin/
 cp $build_root/usr/share/pci.ids initrd/share/
 ln -s bash initrd/bin/sh
 
-echo_status "Creating initrd image."
-dd if=/dev/zero of=initrd.img count=16384 bs=1024 2>/dev/null
+
+SIZE=$(( 1024 * $ROCKCFG_T_ROUTER_INITRD_SIZE ))
+REALSIZE=`du -sk initrd | cut -d'	' -f1`
+
+if [ $REALSIZE -gt $SIZE ] ; then
+	echo_error "Initrd too small!" 
+	echo_status "$REALSIZE kb are needed, but you only want $SIZE kb."
+	echo_status "please re-run ./scripts/Config and increase the initrd size!"
+	exit 1
+fi
+
+echo_status "Creating initrd image ($SIZE kb)."
+dd if=/dev/zero of=initrd.img count=$SIZE bs=1024 2>/dev/null
 mke2fs -qF initrd.img 2>/dev/null
 mount -o loop initrd.img initrd.mnt
 cp -a initrd/* initrd.mnt/
@@ -104,7 +115,8 @@ echo_status "Create isolinux setup."
 tar --use-compress-program=bzip2 \
 	-xOf $base/download/mirror/s/syslinux-3.07.tar.bz2 \
 	syslinux-3.07/isolinux.bin > isolinux.bin
-cp $base/target/$target/isolinux.cfg .
+sed -e "s,@INITRD_SIZE@,$SIZE," -e "s,@SERIAL_BAUD@,$ROCKCFG_T_ROUTER_SERIAL_BAUD," \
+	$base/target/$target/isolinux.cfg > ./isolinux.cfg
 
 echo_status "Create iso description."
 cat > ../isofs.txt <<- EOT
diff --git a/target/router/config.in b/target/router/config.in
index a60711662..6136f2f0a 100644
--- a/target/router/config.in
+++ b/target/router/config.in
@@ -31,3 +31,5 @@ ROCKCFGSET_CREATE_DOCS=0
 ROCKCFGSET_DISABLE_NLS=1
 ROCKCFGSET_OPTSIZE=1
 
+text 'Size of the initrd (in MB)' ROCKCFG_T_ROUTER_INITRD_SIZE '16'
+text 'Serial Port Baud Rate' ROCKCFG_T_ROUTER_SERIAL_BAUD '19200'
diff --git a/target/router/download.txt b/target/router/download.txt
index b716baef3..a6664c0df 100644
--- a/target/router/download.txt
+++ b/target/router/download.txt
@@ -1 +1 @@
-2125465292 syslinux-2.11.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/
+454536525 syslinux-3.07.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/
diff --git a/target/router/isolinux.cfg b/target/router/isolinux.cfg
index 106af7cbe..10129f748 100644
--- a/target/router/isolinux.cfg
+++ b/target/router/isolinux.cfg
@@ -1,7 +1,7 @@
-SERIAL 0 38400
+SERIAL 0 @SERIAL_BAUD@
 DEFAULT router
 
 LABEL router
 	kernel vmlinuz
-	APPEND initrd=initrd.img root=/dev/ram ramdisk_size=16384 rw
+	APPEND initrd=initrd.img root=/dev/ram ramdisk_size=@INITRD_SIZE@ console=ttyS0,@SERIAL_BAUD@ rw