diff --git a/.gitignore b/.gitignore
index 6d742c338..aa2d45fb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ src/darwintracelib1.0/tests/stat
 src/darwintracelib1.0/sip_copy_proc.[ch]
 src/machista1.0/tests/libmachista-test
 src/port/*
+!src/port/port-tclsh.in
 !src/port/*.tcl
 src/programs/*/build/
 src/**/*.o
diff --git a/configure.ac b/configure.ac
index e6e5bf5b0..4044518e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -495,5 +495,6 @@ AC_CONFIG_FILES([src/dedup_portfiles.tcl], [chmod +x src/dedup_portfiles.tcl])
 AC_CONFIG_FILES([src/images_to_archives.tcl], [chmod +x src/images_to_archives.tcl])
 AC_CONFIG_FILES([src/pkg_mkindex.sh], [chmod +x src/pkg_mkindex.sh])
 AC_CONFIG_FILES([src/upgrade_sources_conf_default.tcl], [chmod +x src/upgrade_sources_conf_default.tcl])
+AC_CONFIG_FILES([src/port/port-tclsh], [chmod +x src/port/port-tclsh])
 
 AC_OUTPUT
diff --git a/src/port/Makefile.in b/src/port/Makefile.in
index dd02f06f4..f853e4056 100644
--- a/src/port/Makefile.in
+++ b/src/port/Makefile.in
@@ -37,9 +37,8 @@ distclean: clean
 install: all mkdirs
 	$(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${bindir}"
 	$(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${localstatedir}/macports"
-	$(INSTALL)    -o "${DSTUSR}" -g "${DSTGRP}" -m 555 port portindex portmirror "${DESTDIR}${bindir}/"
+	$(INSTALL)    -o "${DSTUSR}" -g "${DSTGRP}" -m 555 port portindex portmirror port-tclsh "${DESTDIR}${bindir}/"
 	$(LN_S) -f port "${DESTDIR}${bindir}/portf"
-	$(LN_S) -f "${TCLSH}" "${DESTDIR}${bindir}/port-tclsh"
 ifeq (darwin,@OS_PLATFORM@)
-	chmod -h 555 "${DESTDIR}${bindir}/portf" "${DESTDIR}${bindir}/port-tclsh"
+	chmod -h 555 "${DESTDIR}${bindir}/portf"
 endif
diff --git a/src/port/port-tclsh.in b/src/port/port-tclsh.in
new file mode 100644
index 000000000..c8a86468c
--- /dev/null
+++ b/src/port/port-tclsh.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec "@TCLSH@" "$@"