diff --git a/rrdtool/bindings/tcl/Makefile.am b/rrdtool/bindings/tcl/Makefile.am
index c0e8b0f..0ed1d44 100644
--- a/rrdtool/bindings/tcl/Makefile.am
+++ b/rrdtool/bindings/tcl/Makefile.am
@@ -1,4 +1,3 @@
-
 EXTRA_DIST = README tclrrd.c
 
 VERSION = @VERSION@
@@ -11,6 +10,7 @@
 TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
 TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
 TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
+TCL_PACKAGE_LIB = @TCL_PACKAGE_LIB@
 TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
 TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
 TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
@@ -24,7 +24,7 @@
 tclpkgdir = @TCL_PACKAGE_DIR@
 tclpkg_DATA = pkgIndex.tcl
 tclpkg_SCRIPTS = ifOctets.tcl
-tclpkg_rellibdir = $(libdir)
+tclpkg_rellibdir = $(TCL_PACKAGE_LIB)
 else
 tclpkgdir = $(pkglibdir)
 tclpkg_DATA = pkgIndex.tcl
diff --git a/rrdtool/configure.ac b/rrdtool/configure.ac
index 9db50af..e5d71f4 100644
--- a/rrdtool/configure.ac
+++ b/rrdtool/configure.ac
@@ -858,12 +858,13 @@ if test  "$enable_tcl" = "yes"; then
   else
 	. $tcl_config
 	TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION"
+	TCL_PACKAGE_LIB="$libdir/tcl"
 	if test -n "$TCL_INC_DIR"; then
 	  TCL_INCLUDE_SPEC="$TCL_INCLUDE_SPEC -I$TCL_INC_DIR"
 	fi
   fi
   AC_ARG_ENABLE(tcl-site,AS_HELP_STRING([--enable-tcl-site],[install the tcl extension in the tcl tree]),
-  [],[enable_tcl_site=yes])
+  [enable_tcl_site="$enable_tcl"],[enable_tcl_site=yes])
 
 fi
 
@@ -875,7 +876,7 @@ AC_SUBST(TCL_PREFIX)
 AC_SUBST(TCL_SHLIB_CFLAGS)
 AC_SUBST(TCL_SHLIB_LD)
 AC_SUBST(TCL_SHLIB_SUFFIX)
-AC_SUBST(TCL_PACKAGE_PATH)
+AC_SUBST(TCL_PACKAGE_LIB)
 AC_SUBST(TCL_LD_SEARCH_FLAGS)
 AC_SUBST(TCL_STUB_LIB_SPEC)
 AC_SUBST(TCL_VERSION)