diff --git a/package/base/tcl/tcl.conf b/package/base/tcl/tcl.conf
index 12fac2f24..a195e3011 100644
--- a/package/base/tcl/tcl.conf
+++ b/package/base/tcl/tcl.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -20,11 +21,11 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/base/tcl/tcl_config.sh
+var_append makeinstopt " " "install-private-headers"
 
 hook_add preconf 3 "cd unix" 
-hook_add postinstall 3 'ln -vsf tclsh8.4 $bindir/tclsh'
-hook_add postinstall 3 "ln -vsf libtcl`tcl_libver $ver`.so $libdir/libtcl.so"
+hook_add postinstall 3 'ln -vsf tclsh${ver:0:3} $bindir/tclsh'
+hook_add postinstall 3 'ln -vsf libtcl${ver:0:3}.so $libdir/libtcl.so'
 
 # install headers required e.g. by itcl and brlcad
-hook_add postmake 3 "cp -a ../generic/tclInt.h ../generic/tclIntDecls.h $root/usr/include"
+hook_add postmake 3 "cp -a ../generic/tclInt.h ../generic/tclIntDecls.h $includedir"