diff --git a/common/shlibs b/common/shlibs
index bca3e40bc5..ce1f7939b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -331,9 +331,8 @@ libpoppler.so.36 poppler-0.22.3_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt4.so.3 poppler-qt4-0.18.2_1
-libtcl8.5.so tcl-8.5.8_1
+libtcl8.6.so tcl-8.6.0_1
 libsqlite3.so.0 sqlite-3.6.13_1
-libtclsqlite3.so sqlite-tcl-3.6.13_1
 libIDL-2.so.0 libIDL-0.8.13_1
 libnspr4.so nspr-4.8_1
 libplc4.so nspr-4.8_1
diff --git a/srcpkgs/tk-devel b/srcpkgs/tk-devel
new file mode 120000
index 0000000000..7d971ab981
--- /dev/null
+++ b/srcpkgs/tk-devel
@@ -0,0 +1 @@
+tk
\ No newline at end of file
diff --git a/srcpkgs/tk/template b/srcpkgs/tk/template
new file mode 100644
index 0000000000..c7cc933a62
--- /dev/null
+++ b/srcpkgs/tk/template
@@ -0,0 +1,53 @@
+# Template file for 'tk'
+pkgname=tk
+version=8.6.0
+revision=1
+wrksrc="tk${version}"
+build_wrksrc=unix
+short_desc="The TK graphical user interface toolkit for TCL"
+maintainer="pancake <pancake@nopcode.org>"
+homepage="http://www.tcl.tk"
+license="tcl/tk"
+distfiles="${SOURCEFORGE_SITE}/tcl/${pkgname}${version}-src.tar.gz"
+checksum=5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6
+makedepends="tcl-devel libX11-devel"
+depends="tcl"
+
+do_configure() {
+	if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+		local args="${configure_args} --enable-64bits"
+	fi
+
+	./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \
+		--without-tzdata --enable-man-symlinks \
+		--disable-static --disable-rpath \
+		tk_cv_strtod_unbroken=ok $args
+}
+
+do_build() {
+	make ${makejobs}
+}
+	
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install install-private-headers
+	vinstall ../license.terms 644 usr/share/licenses/tk LICENSE
+	# Set proper perms to shlibs.
+	chmod 755 ${DESTDIR}/usr/lib/*.so*
+}
+
+tk-devel_package() {
+	depends="tk>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/lib/tkConfig.sh
+		vmove usr/include
+		vmove usr/share/man/man3
+		vmove usr/share/man/mann
+	}
+}
+
+tk_package() {
+	pkg_install() {
+		vmove usr
+	}
+}