diff --git a/README.md b/README.md
index d42c8c4..377835a 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@ These are the scripts used to compile the ev3dev kernel. Originally it also
 included scripts to bootstrap a root file system and create a disk image.
 Those scripts have evolved into the [brickstrap] package.
 
-**NOTE:** The instructions below are for ev3dev-stretch. If you want to build
-a kernel for ev3dev-jessie, please use the [ev3dev-jessie branch].
+**NOTE:** The instructions below are for ev3dev-buster. If you want to build
+a kernel for ev3dev-stretch, please use the [ev3dev-stretch branch].
 
-[ev3dev-jessie branch]: https://github.com/ev3dev/ev3dev-buildscripts/tree/ev3dev-jessie
+[ev3dev-stretch branch]: https://github.com/ev3dev/ev3dev-buildscripts/tree/ev3dev-stretch
 
 System Requirements
 -------------------
@@ -80,17 +80,12 @@ First time kernel build
         # BeagleBoard
         EV3DEV_KERNEL_FLAVOR=bb.org ./build-kernel
 
-6.  That's it! The uImage and kernel modules you just built are saved in
-    `./build-area`. You just need to copy the files to your
-    already formatted SD card. For an easier way of getting the kernel on
-    your EV3, see [Sharing Your Kernel](#sharing-your-kernel). Starting with
-    ev3dev-stretch images dated 2018-05 or later, the uImage file is no longer
-    used. Create a Debian package as described in the *Sharing Your Kernel*
-    section.
-
-        ~/work/ev3dev-buildscripts $ cd ./build-area/linux-ev3dev-ev3-dist
-        ~/work/ev3dev-buildscripts/build-area/linux-ev3dev-ev3-dist $ cp uImage <path-to-boot-partition>/uImage
-        ~/work/ev3dev-buildscripts/build-area/linux-ev3dev-ev3-dist $ sudo cp -r lib/ <path-to-file-system-partition>
+6.  That's it!  
+
+    TODO: add instructions on how to modify uEnv.txt to use uImage file.
+ 
+    For now, see [Sharing Your Kernel](#sharing-your-kernel) for how to create
+    a debian package to install the kernel you just built.
 
 
 Faster Builds and Custom Locations
diff --git a/setup-env b/setup-env
index cea73d6..ac44422 100755
--- a/setup-env
+++ b/setup-env
@@ -53,7 +53,10 @@ fi
 export EV3DEV_KERNEL_FLAVOR=${EV3DEV_KERNEL_FLAVOR-"ev3"}
 export EV3DEV_BUILD_AREA=${EV3DEV_BUILD_AREA-"$(pwd)/build-area"}
 export EV3DEV_MERGE_CMD=${EV3DEV_MERGE_CMD-"vimdiff \$file1 \$file2"}
-export EV3DEV_ABI=${EV3DEV_ABI-"arm-linux-gnueabi-"}
+
+export EV3DEV_TOOLCHAIN=${EV3DEV_TOOLCHAIN-"/usr/bin"}
+export EV3DEV_ABI=${EV3DEV_ABI-"arm-linux-gnueabihf-"}
+
 
 if [ "$EV3DEV_KERNEL_FLAVOR" = "ev3" ]; then
     export EV3DEV_KERNEL=${EV3DEV_KERNEL-"$(pwd)/../ev3-kernel"}