diff --git a/patch.sh b/patch.sh
index 10c1ac9a681a6044a302eae0880b729d8fb9d72f..8f8416649dc04eca5b8d33150340f377947af74b 100644
--- a/patch.sh
+++ b/patch.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/sh -e
 #
-# Copyright (c) 2009-2015 Robert Nelson <robertcnelson@gmail.com>
+# Copyright (c) 2009-2016 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
@@ -123,13 +123,37 @@ aufs4 () {
 
 	#regenerate="enable"
 	if [ "x${regenerate}" = "xenable" ] ; then
-		start_cleanup
+		echo "dir: aufs4"
+
+		cd ../
+		if [ ! -f ./aufs4-standalone ] ; then
+			git clone https://github.com/sfjro/aufs4-standalone
+			cd ./aufs4-standalone
+			git checkout origin/aufs${KERNEL_REL} -b tmp
+			cd ../
+		fi
+		cd ./KERNEL/
+
+		cp -v ../aufs4-standalone/Documentation/ABI/testing/*aufs ./Documentation/ABI/testing/
+		mkdir -p ./Documentation/filesystems/aufs/
+		cp -rv ../aufs4-standalone/Documentation/filesystems/aufs/* ./Documentation/filesystems/aufs/
+		mkdir -p ./fs/aufs/
+		cp -v ../aufs4-standalone/fs/aufs/* ./fs/aufs/
+		cp -v ../aufs4-standalone/include/uapi/linux/aufs_type.h ./include/uapi/linux/
+
+		git add .
+		git commit -a -m 'merge: aufs4' -s
+		git format-patch -5 -o ../patches/aufs4/
+
+		exit 2
 	fi
 
-	#patch -p1 < "${DIR}/patches/aufs4/0005-aufs-why-this-isnt-a-patch.patch"
-	#exit 2
+	#regenerate="enable"
+	if [ "x${regenerate}" = "xenable" ] ; then
+		start_cleanup
+	fi
 
-	${git} "${DIR}/patches/aufs4/0005-aufs-why-this-isnt-a-patch.patch"
+	${git} "${DIR}/patches/aufs4/0005-merge-aufs4.patch"
 
 	if [ "x${regenerate}" = "xenable" ] ; then
 		number=5
diff --git a/scripts/gcc.sh b/scripts/gcc.sh
index 845404f7a833294165e1c07d6b3fc85479e74ece..641c467e862f71d003253856486810d1acff6089 100755
--- a/scripts/gcc.sh
+++ b/scripts/gcc.sh
@@ -96,14 +96,14 @@ gcc_toolchain () {
 		;;
 	gcc_linaro_eabi_4_9)
 		#
-		#https://releases.linaro.org/15.05/components/toolchain/binaries/arm-eabi/gcc-linaro-4.9-2015.05-x86_64_arm-eabi.tar.xz
+		#https://releases.linaro.org/components/toolchain/binaries/4.9-2016.02/arm-eabi/gcc-linaro-5.3-2016.02-x86_64_arm-eabi.tar.xz
 		#
 
 		gcc_version="4.9"
-		release="15.05"
+		release="16.02"
 		target="arm-eabi"
 
-		version="${release}/components/toolchain/binaries/${target}"
+		version="components/toolchain/binaries/${gcc_version}-20${release}/${target}"
 		filename="gcc-linaro-${gcc_version}-20${release}-x86_64_arm-eabi.tar.xz"
 		directory="gcc-linaro-${gcc_version}-20${release}-x86_64_arm-eabi"
 
@@ -189,14 +189,14 @@ gcc_toolchain () {
 		;;
 	gcc_linaro_gnueabihf_4_9)
 		#
-		#https://releases.linaro.org/15.05/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.05-x86_64_arm-linux-gnueabihf.tar.xz
+		#https://releases.linaro.org/components/toolchain/binaries/4.9-2016.02/arm-linux-gnueabihf/gcc-linaro-4.9-2016.02-x86_64_arm-linux-gnueabihf.tar.xz
 		#
 
 		gcc_version="4.9"
-		release="15.05"
+		release="16.02"
 		target="arm-linux-gnueabihf"
 
-		version="${release}/components/toolchain/binaries/${target}"
+		version="components/toolchain/binaries/${gcc_version}-20${release}/${target}"
 		filename="gcc-linaro-${gcc_version}-20${release}-x86_64_${target}.tar.xz"
 		directory="gcc-linaro-${gcc_version}-20${release}-x86_64_${target}"