diff --git a/scripts/download-env.sh b/scripts/download-env.sh
index 684486a2f..a4607cf60 100755
--- a/scripts/download-env.sh
+++ b/scripts/download-env.sh
@@ -381,6 +381,13 @@ if [ "$PLATFORM" = "icebreaker" -o "$PLATFORM" = "ice40_hx8k_b_evn" -o "$PLATFOR
 	check_exists iceprog
 fi
 
+if [ "$PLATFORM" = "icefun"]; then
+	echo
+	echo "Installing icefunprog (tool for icefun pic Programming)"
+	conda install icefunprog
+	check_exists icefunprog
+fi
+
 # fxload
 if [ "$PLATFORM" = "opsis" -o "$PLATFORM" = "atlys" ]; then
 	echo
diff --git a/scripts/enter-env.sh b/scripts/enter-env.sh
index 946380544..bfcd7466e 100755
--- a/scripts/enter-env.sh
+++ b/scripts/enter-env.sh
@@ -310,24 +310,28 @@ echo "-----------------------------------------"
 
 # tinyfpga boards
 if [ "$PLATFORM" = "tinyfpga_b2" ]; then
-
-
-
 	check_exists tinyfpgab || return 1
 fi
-if [ "$PLATFORM" = "tinyfpga_bx" ]; then
-
-
 
+if [ "$PLATFORM" = "tinyfpga_bx" ]; then
 	check_exists tinyprog || return 1
 fi
 
 # fxload
 if [ "$PLATFORM" = "opsis" -o "$PLATFORM" = "atlys" ]; then
+	check_exists fxload || return 1
+fi
 
+if [ "$PLATFORM" = "tinyfpga_b2" ]; then
+	check_exists tinyfpgab || return 1
+fi
 
+if [ "$PLATFORM" = "icebreaker" -o "$PLATFORM" = "ice40_hx8k_b_evn" -o "$PLATFORM" = "ice40_up5k_b_evn" ]; then
+	check_exists iceprog
+fi
 
-	check_exists fxload || return 1
+if [ "$PLATFORM" = "icefun" ]; then
+	check_exists iceprogfun || return 1
 fi
 
 # FIXME: Remove this once @jimmo has finished his new firmware