Index: server/buildpkgs/Tkimg/build.sh
==================================================================
--- server/buildpkgs/Tkimg/build.sh
+++ server/buildpkgs/Tkimg/build.sh
@@ -18,13 +18,18 @@
 
 # We require linking against Tk, so find Tk 8.4 and use it.  If it can't be found, abort.
 tcl_plat_build_dir="$(basename "${TCLBUILDDIR}")"
 tkdir="$(echo "$(pwd)/../Tk84/build"/tk*/${tcl_plat_build_dir})"
 if [ ! -d "${tkdir}" -o ! -f "${tkdir}/tkConfig.sh" ]; then
-	echo "Unable to find Tk 8.4 directory, please build Tk84 before Tkimg" >&2
+	setup_tcl85
+
+	tkdir="$(echo "$(pwd)/../Tk85/build"/tk*/${tcl_plat_build_dir})"
+	if [ ! -d "${tkdir}" -o ! -f "${tkdir}/tkConfig.sh" ]; then
+		echo "Unable to find Tk 8.4 or Tk 8.5 directory, please build Tk84 or Tk85 before Tkimg" >&2
 
-	exit 1
+		exit 1
+	fi
 fi
 
 # Determine installation root
 
 INSTROOT="$(pwd)/out"