diff --git a/srcpkgs/tcl/tcl-devel.template b/srcpkgs/tcl/tcl-devel.template
index a888ee484d..4c57c2eed3 100644
--- a/srcpkgs/tcl/tcl-devel.template
+++ b/srcpkgs/tcl/tcl-devel.template
@@ -5,15 +5,16 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run glibc-devel
 Add_dependency run tcl
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man/man3
+	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
 	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}//usr/lib/tclConfig.sh ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share/man/mann/* ${DESTDIR}/usr/share/man/man3
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3/* ${DESTDIR}/usr/share/man/man3
+	mv ${SRCPKGDESTDIR}/usr/share/man/man{3,n} ${DESTDIR}/usr/share/man
 }
diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template
index 25f1b1b7e6..725884e16b 100644
--- a/srcpkgs/tcl/template
+++ b/srcpkgs/tcl/template
@@ -1,11 +1,15 @@
 # Template file for 'tcl'
 pkgname=tcl
 version=8.5.8
+revision=1
 wrksrc="tcl${version}"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}${version}-src.tar.gz"
 build_style=gnu_configure
 configure_script="./unix/configure"
-configure_args="--enable-threads"
+configure_args="--enable-threads --without-tzdata --enable-man-symlinks"
+if [ "${xbps_machine}" = "x86_64" ]; then
+	configure_args="${configure_args} --enable-64bits"
+fi
 make_install_target="INSTALL_ROOT=$XBPS_DESTDIR/$pkgname-$version
  install install-private-headers"
 short_desc="The TCL scripting language"
@@ -21,8 +25,6 @@ Add_dependency run glibc
 
 post_install()
 {
-	install -d ${DESTDIR}/usr/share/man/man1
-	mv ${DESTDIR}/usr/share/man/mann/tclsh.n \
-		${DESTDIR}/usr/share/man/man1/tclsh.1
 	cd ${DESTDIR}/usr/bin && ln -sf tclsh8.5 tclsh
+	chmod 755 ${DESTDIR}/usr/lib/libtcl*.so*
 }