diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,34 +1,50 @@
 name       : tk
-version    : 8.6.6
-release    : 6
+version    : 8.6.8
+release    : 7
 source     :
-    - http://prdownloads.sourceforge.net/tcl/tk8.6.6-src.tar.gz : d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d
-homepage   : http://www.tcl.tk
-license    :
-    - TCL
+    - https://netcologne.dl.sourceforge.net/project/tcl/Tcl/8.6.8/tk8.6.8-src.tar.gz : 49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33
+homepage   : https://www.tcl.tk
+license    : TCL
+component  : programming.library
+libsplit   : no
 summary    : Tk (GUI toolkit standard for Tcl)
+description: |
+    TK is a graphical user interface toolkit that is standard for Tcl but also allows application programming in other languages as well, allowing for applications to run on multiple platforms.
 builddeps  :
     - pkgconfig(tcl)
     - pkgconfig(x11)
     - pkgconfig(xft)
     - pkgconfig(xscrnsaver)
-component  : programming.library
-libsplit   : no
 patterns   :
-    - docs:
+    - demos:
+        - /usr/lib64/tk8.6/demos
+    - devel:
+        - /usr/lib64/tk*/include/*/*.h
+    - docs :
         - /usr/share/doc
         - /usr/share/man/mann
         - /usr/share/man/man3
-        - /usr/lib/tk8.6/demos/
-description: |
-    TK is a graphical user interface toolkit that is standard for Tcl but also allows application programming in other languages as well, allowing for applications to run on multiple platforms.
 setup      : |
     pushd unix
-    %configure --disable-static --includedir=/usr/include/tk8.6 --enable-64bit CFLAGS="$CFLAGS -I/usr/include/tcl8.6"
+        %configure --disable-static \
+            --includedir=/usr/include/tk${version%.*} \
+            --enable-64bit \
+            CFLAGS="$CFLAGS -I/usr/include/tcl${version%.*}"
+    popd
 build      : |
-    pushd unix
-    %make
+    %make -C unix TK_LIBRARY=%libdir%/tk${version%.*}
 install    : |
-    pushd unix
-    %make_install
-    ln -s /usr/bin/wish8.6 $installdir/usr/bin/wish
+    export tv="tk${version%.*}"
+
+    %make_install -C unix TK_LIBRARY=%libdir%/$tv
+
+    # install private headers
+    mkdir -p $installdir%libdir%/$tv/include/{generic,unix}
+    find generic unix -name "*.h" -exec install '{}' $installdir%libdir%/$tv/include/'{}' ';'
+
+    ln -sv /usr/bin/wish${version%.*} $installdir/usr/bin/wish
+    ln -sv lib$tv.so $installdir%libdir%/libtk.so
+
+    # remove build $workdir traces
+    libdir=%libdir%     # stupid hack because the substitution of %libdir% does not work
+    sed -e "s|$workdir/unix|$libdir|" -e "s|$workdir|$libdir/$tv/include|" -i $installdir/$libdir/tkConfig.sh
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -1,10 +1,10 @@
 <PISI>
     <Source>
         <Name>tk</Name>
-        <Homepage>http://www.tcl.tk</Homepage>
+        <Homepage>https://www.tcl.tk</Homepage>
         <Packager>
-            <Name>Zev Goldstein</Name>
-            <Email>Zev.Goldstein@gmail.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Packager>
         <License>TCL</License>
         <PartOf>programming.library</PartOf>
@@ -21,98 +21,107 @@
         <PartOf>programming.library</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib/tk8.6/bgerror.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/button.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/choosedir.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/clrpick.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/comdlg.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/console.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/dialog.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/entry.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/focus.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/fontchooser.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/iconlist.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/icons.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/README</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/logo.eps</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/logo100.gif</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/logo64.gif</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/logoLarge.gif</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/logoMed.gif</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/pwrdLogo.eps</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/pwrdLogo100.gif</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/pwrdLogo150.gif</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/pwrdLogo175.gif</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/pwrdLogo200.gif</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/pwrdLogo75.gif</Path>
-            <Path fileType="library">/usr/lib/tk8.6/images/tai-ku.gif</Path>
-            <Path fileType="library">/usr/lib/tk8.6/listbox.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/megawidget.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/menu.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/mkpsenc.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgbox.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/cs.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/da.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/de.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/el.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/en.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/en_gb.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/eo.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/es.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/fr.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/hu.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/it.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/nl.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/pl.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/pt.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/ru.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/msgs/sv.msg</Path>
-            <Path fileType="library">/usr/lib/tk8.6/obsolete.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/optMenu.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/palette.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/panedwindow.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/safetk.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/scale.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/scrlbar.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/spinbox.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/tclIndex</Path>
-            <Path fileType="library">/usr/lib/tk8.6/tearoff.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/text.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/tk.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/tkAppInit.c</Path>
-            <Path fileType="library">/usr/lib/tk8.6/tkfbox.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/altTheme.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/aquaTheme.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/button.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/clamTheme.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/classicTheme.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/combobox.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/cursors.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/defaults.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/entry.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/fonts.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/menubutton.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/notebook.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/panedwindow.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/progress.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/scale.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/scrollbar.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/sizegrip.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/spinbox.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/treeview.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/ttk.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/utils.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/vistaTheme.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/winTheme.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/ttk/xpTheme.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/unsupported.tcl</Path>
-            <Path fileType="library">/usr/lib/tk8.6/xmfbox.tcl</Path>
             <Path fileType="library">/usr/lib64/lib*.so</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/bgerror.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/button.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/choosedir.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/clrpick.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/comdlg.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/console.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/dialog.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/entry.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/focus.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/fontchooser.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/iconlist.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/icons.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/README</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/logo.eps</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/logo100.gif</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/logo64.gif</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/logoLarge.gif</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/logoMed.gif</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/pwrdLogo.eps</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/pwrdLogo100.gif</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/pwrdLogo150.gif</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/pwrdLogo175.gif</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/pwrdLogo200.gif</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/pwrdLogo75.gif</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/images/tai-ku.gif</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/listbox.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/megawidget.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/menu.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/mkpsenc.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgbox.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/cs.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/da.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/de.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/el.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/en.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/en_gb.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/eo.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/es.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/fr.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/hu.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/it.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/nl.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/pl.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/pt.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/ru.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/msgs/sv.msg</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/obsolete.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/optMenu.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/palette.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/panedwindow.tcl</Path>
             <Path fileType="library">/usr/lib64/tk8.6/pkgIndex.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/safetk.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/scale.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/scrlbar.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/spinbox.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/tclIndex</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/tearoff.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/text.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/tk.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/tkAppInit.c</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/tkfbox.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/altTheme.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/aquaTheme.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/button.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/clamTheme.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/classicTheme.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/combobox.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/cursors.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/defaults.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/entry.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/fonts.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/menubutton.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/notebook.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/panedwindow.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/progress.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/scale.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/scrollbar.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/sizegrip.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/spinbox.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/treeview.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/ttk.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/utils.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/vistaTheme.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/winTheme.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/ttk/xpTheme.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/unsupported.tcl</Path>
+            <Path fileType="library">/usr/lib64/tk8.6/xmfbox.tcl</Path>
             <Path fileType="library">/usr/lib64/tkConfig.sh</Path>
             <Path fileType="man">/usr/share/man</Path>
         </Files>
     </Package>
+    <Package>
+        <Name>tk-demos</Name>
+        <Summary xml:lang="en">Tk (GUI toolkit standard for Tcl)</Summary>
+        <Description xml:lang="en">TK is a graphical user interface toolkit that is standard for Tcl but also allows application programming in other languages as well, allowing for applications to run on multiple platforms.
+</Description>
+        <Files>
+            <Path fileType="library">/usr/lib64/tk8.6/demos</Path>
+        </Files>
+    </Package>
     <Package>
         <Name>tk-devel</Name>
         <Summary xml:lang="en">Development files for tk</Summary>
@@ -120,12 +129,13 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="6">tk</Dependency>
+            <Dependency release="7">tk</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/</Path>
             <Path fileType="library">/usr/lib64/lib*.a</Path>
             <Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
+            <Path fileType="library">/usr/lib64/tk*/include/*/*.h</Path>
         </Files>
     </Package>
     <Package>
@@ -135,18 +145,17 @@
 </Description>
         <PartOf>programming.docs</PartOf>
         <Files>
-            <Path fileType="library">/usr/lib/tk8.6/demos/</Path>
             <Path fileType="man">/usr/share/man/man3</Path>
             <Path fileType="man">/usr/share/man/mann</Path>
         </Files>
     </Package>
     <History>
-        <Update release="6">
-            <Date>2017-11-14</Date>
-            <Version>8.6.6</Version>
+        <Update release="7">
+            <Date>2018-03-05</Date>
+            <Version>8.6.8</Version>
             <Comment>Packaging update</Comment>
-            <Name>Zev Goldstein</Name>
-            <Email>Zev.Goldstein@gmail.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file