Slackware 14.1slackware-14.1

Mon Nov  4 17:08:47 UTC 2013
Slackware 14.1 x86_64 stable is released!

It's been another interesting release cycle here at Slackware bringing
new features like support for UEFI machines, updated compilers and
development tools, the switch from MySQL to MariaDB, and many more
improvements throughout the system.  Thanks to the team, the upstream
developers, the dedicated Slackware community, and everyone else who
pitched in to help make this release a reality.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Have fun!  :-)

42 files changed, 428 insertions, 134 deletions

diff --git a/slackware64/a/maketag b/slackware64/a/maketag
index 879801165..4306c4c88 100644
--- a/slackware64/a/maketag
+++ b/slackware64/a/maketag
@@ -35,7 +35,9 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "dosfstools" "Tools for working with FAT filesystems" "on" \
 "e2fsprogs" "Utilities for ext2/ext3 filesystems - REQUIRED" "on" \
 "ed" "A clone of the old, original UN*X line editor" "on" \
+"efibootmgr" "Tool to modify UEFI boot entries" "on" \
 "eject" "A tool for ejecting removable media" "on" \
+"elilo" "Linux Loader for EFI-based platforms" "on" \
 "elvis" "elvis text editor (vi clone) - REQUIRED" "on" \
 "etc" "System config files & utilities - REQUIRED" "on" \
 "file" "Determines what file format data is in" "on" \
@@ -50,16 +52,17 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "gpm" "Cut and paste text with your mouse" "on" \
 "gptfdisk" "GPT fdisk utilities" "on" \
 "grep" "GNU grep searching tool - REQUIRED" "on" \
+"grub" "GNU GRUB, the GRand Unified Bootloader" "on" \
 "gzip" "GNU zip compression utility - REQUIRED" "on" \
 "hdparm" "Get/Set IDE hard drive parameters" "on" \
 "infozip" "zip/unzip archive utilities" "on" \
 "inotify-tools" "Command-line tools for using inotify." "on" \
 "jfsutils" "Utilities for IBM's Journaled Filesystem" "on" \
 "kbd" "Change keyboard and console mappings" "on" \
-"kernel-firmware" "Linux 3.2.29 kernel firmware -- REQUIRED" "on" \
-"kernel-generic" "Generic 3.2.29 kernel (needs an initrd)" "on" \
-"kernel-huge" "Loaded 3.2.29 Linux kernel" "on" \
-"kernel-modules" "Linux 3.2.29 kernel modules -- REQUIRED" "on" \
+"kernel-firmware" "Linux kernel firmware -- REQUIRED" "on" \
+"kernel-generic" "Generic 3.10.17 kernel (needs an initrd)" "on" \
+"kernel-huge" "Loaded 3.10.17 Linux kernel" "on" \
+"kernel-modules" "Linux 3.10.17 kernel modules -- REQUIRED" "on" \
 "kmod" "Kernel module utilities -- REQUIRED" "on" \
 "less" "A text pager utility - REQUIRED" "on" \
 "lha" "LHA archive utility" "on" \
@@ -77,9 +80,10 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "ncompress" "The historic compress utility" "on" \
 "ntfs-3g" "FUSE-based NTFS read-write mount program" "on" \
 "openssl-solibs" "OpenSSL shared libraries -- REQUIRED" "on" \
+"os-prober" "A tool for finding bootable OS partitions" "on" \
 "patch" "Applies a diff file to an original file" "on" \
 "pciutils" "Linux PCI utilities" "on" \
-"pcmciautils" "PCMCIA card services for 2.6.x+ kernels" "on" \
+"pcmciautils" "PCMCIA card services for the Linux kernel" "on" \
 "pkgtools" "Slackware package management tools - REQUIRED" "on" \
 "procps" "Displays process info - REQUIRED" "on" \
 "quota" "User disk quota utilities" "on" \
@@ -102,7 +106,7 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "tcsh" "Extended C shell /bin/tcsh" "on" \
 "time" "Times how long a process takes to run" "on" \
 "tree" "Display a directory in tree form" "on" \
-"udev" "System for managing /dev in 2.6 - RECOMMENDED" "on" \
+"udev" "Manages /dev and modules - REQUIRED" "on" \
 "udisks" "storage device daemon" "on" \
 "udisks2" "storage device daemon v2" "on" \
 "unarj" "Extract ARJ archives" "on" \
@@ -111,7 +115,7 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "usbutils" "Linux USB utilities" "on" \
 "utempter" "Library used for writing to utmp/wtmp" "on" \
 "util-linux" "Util-linux utilities - REQUIRED" "on" \
-"which" "Locate an executable in your $PATH" "on" \
+"which" "Locate an executable in your \$PATH" "on" \
 "xfsprogs" "Utilities for SGI's XFS filesystem" "on" \
 "xz" "xz (LZMA) compression utility - REQUIRED" "on" \
 "zoo" "Zoo archive utility" "on" \
@@ -120,7 +124,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr eject elilo elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd mt-st mtx ncompress ntfs-3g openssl-solibs os-prober patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -128,9 +132,9 @@ aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr eject elilo elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd mt-st mtx ncompress ntfs-3g openssl-solibs os-prober patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/a/maketag.ez b/slackware64/a/maketag.ez
index 879801165..4306c4c88 100644
--- a/slackware64/a/maketag.ez
+++ b/slackware64/a/maketag.ez
@@ -35,7 +35,9 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "dosfstools" "Tools for working with FAT filesystems" "on" \
 "e2fsprogs" "Utilities for ext2/ext3 filesystems - REQUIRED" "on" \
 "ed" "A clone of the old, original UN*X line editor" "on" \
+"efibootmgr" "Tool to modify UEFI boot entries" "on" \
 "eject" "A tool for ejecting removable media" "on" \
+"elilo" "Linux Loader for EFI-based platforms" "on" \
 "elvis" "elvis text editor (vi clone) - REQUIRED" "on" \
 "etc" "System config files & utilities - REQUIRED" "on" \
 "file" "Determines what file format data is in" "on" \
@@ -50,16 +52,17 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "gpm" "Cut and paste text with your mouse" "on" \
 "gptfdisk" "GPT fdisk utilities" "on" \
 "grep" "GNU grep searching tool - REQUIRED" "on" \
+"grub" "GNU GRUB, the GRand Unified Bootloader" "on" \
 "gzip" "GNU zip compression utility - REQUIRED" "on" \
 "hdparm" "Get/Set IDE hard drive parameters" "on" \
 "infozip" "zip/unzip archive utilities" "on" \
 "inotify-tools" "Command-line tools for using inotify." "on" \
 "jfsutils" "Utilities for IBM's Journaled Filesystem" "on" \
 "kbd" "Change keyboard and console mappings" "on" \
-"kernel-firmware" "Linux 3.2.29 kernel firmware -- REQUIRED" "on" \
-"kernel-generic" "Generic 3.2.29 kernel (needs an initrd)" "on" \
-"kernel-huge" "Loaded 3.2.29 Linux kernel" "on" \
-"kernel-modules" "Linux 3.2.29 kernel modules -- REQUIRED" "on" \
+"kernel-firmware" "Linux kernel firmware -- REQUIRED" "on" \
+"kernel-generic" "Generic 3.10.17 kernel (needs an initrd)" "on" \
+"kernel-huge" "Loaded 3.10.17 Linux kernel" "on" \
+"kernel-modules" "Linux 3.10.17 kernel modules -- REQUIRED" "on" \
 "kmod" "Kernel module utilities -- REQUIRED" "on" \
 "less" "A text pager utility - REQUIRED" "on" \
 "lha" "LHA archive utility" "on" \
@@ -77,9 +80,10 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "ncompress" "The historic compress utility" "on" \
 "ntfs-3g" "FUSE-based NTFS read-write mount program" "on" \
 "openssl-solibs" "OpenSSL shared libraries -- REQUIRED" "on" \
+"os-prober" "A tool for finding bootable OS partitions" "on" \
 "patch" "Applies a diff file to an original file" "on" \
 "pciutils" "Linux PCI utilities" "on" \
-"pcmciautils" "PCMCIA card services for 2.6.x+ kernels" "on" \
+"pcmciautils" "PCMCIA card services for the Linux kernel" "on" \
 "pkgtools" "Slackware package management tools - REQUIRED" "on" \
 "procps" "Displays process info - REQUIRED" "on" \
 "quota" "User disk quota utilities" "on" \
@@ -102,7 +106,7 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "tcsh" "Extended C shell /bin/tcsh" "on" \
 "time" "Times how long a process takes to run" "on" \
 "tree" "Display a directory in tree form" "on" \
-"udev" "System for managing /dev in 2.6 - RECOMMENDED" "on" \
+"udev" "Manages /dev and modules - REQUIRED" "on" \
 "udisks" "storage device daemon" "on" \
 "udisks2" "storage device daemon v2" "on" \
 "unarj" "Extract ARJ archives" "on" \
@@ -111,7 +115,7 @@ system. :^)  Press ENTER when you are done."  21 76 10 \
 "usbutils" "Linux USB utilities" "on" \
 "utempter" "Library used for writing to utmp/wtmp" "on" \
 "util-linux" "Util-linux utilities - REQUIRED" "on" \
-"which" "Locate an executable in your $PATH" "on" \
+"which" "Locate an executable in your \$PATH" "on" \
 "xfsprogs" "Utilities for SGI's XFS filesystem" "on" \
 "xz" "xz (LZMA) compression utility - REQUIRED" "on" \
 "zoo" "Zoo archive utility" "on" \
@@ -120,7 +124,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr eject elilo elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd mt-st mtx ncompress ntfs-3g openssl-solibs os-prober patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -128,9 +132,9 @@ aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed eject elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd mt-st mtx ncompress ntfs-3g openssl-solibs patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid apmd attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup cups cxxlibs dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr eject elilo elvis etc file findutils floppy gawk genpower gettext getty-ps glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip hdparm infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod less lha libcgroup lilo logrotate lrzip lvm2 mcelog mdadm minicom mkinitrd mt-st mtx ncompress ntfs-3g openssl-solibs os-prober patch pciutils pcmciautils pkgtools procps quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils slocate smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udev udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/a/tagfile b/slackware64/a/tagfile
index 666ba7c56..58e7885ce 100644
--- a/slackware64/a/tagfile
+++ b/slackware64/a/tagfile
@@ -22,7 +22,9 @@ dialog:REC
 dosfstools:REC
 e2fsprogs:ADD
 ed:REC
+efibootmgr:REC
 eject:REC
+elilo:REC
 elvis:ADD
 etc:ADD
 file:REC
@@ -37,6 +39,7 @@ glibc-zoneinfo:ADD
 gpm:REC
 gptfdisk:ADD
 grep:ADD
+grub:REC
 gzip:ADD
 hdparm:ADD
 infozip:ADD
@@ -64,6 +67,7 @@ mtx:REC
 ncompress:REC
 ntfs-3g:OPT
 openssl-solibs:ADD
+os-prober:REC
 patch:REC
 pciutils:REC
 pcmciautils:REC
diff --git a/slackware64/ap/maketag b/slackware64/ap/maketag
index c49ab3c10..0155925a7 100644
--- a/slackware64/ap/maketag
+++ b/slackware64/ap/maketag
@@ -17,7 +17,6 @@ done." 22 72 12 \
 "amp" "A command-line MP3 player" "on" \
 "ash" "A small /bin/sh type shell" "on" \
 "at" "Schedule commands to execute at a later time" "on" \
-"aumix" "Audio mixer for the console or X" "on" \
 "bc" "GNU bc - arbitrary precision math language" "on" \
 "bpe" "Binary Patch (file) Editor" "on" \
 "cdparanoia" "Cdparanoia CD audio ripper" "on" \
@@ -33,7 +32,7 @@ done." 22 72 12 \
 "enscript" "A text to PostScript utility" "on" \
 "flac" "Free Lossless Audio Codec" "on" \
 "foomatic-filters" "Print filter for gutenprint and hplip" "on" \
-"ghostscript" "GPL Ghostscript PS/PDF interpreter" "on" \
+"ghostscript" "Ghostscript PS/PDF interpreter" "on" \
 "ghostscript-fonts-std" "Ghostscript Type1 fonts" "on" \
 "gphoto2" "A command-line camera client for libgphoto2" "on" \
 "groff" "GNU groff document formatting system" "on" \
@@ -41,6 +40,7 @@ done." 22 72 12 \
 "hplip" "HP printing and scanning software" "on" \
 "htop" "An ncurses-based process viewer" "on" \
 "ispell" "The International version of ispell" "on" \
+"itstool" "Translate XML documents with PO files" "on" \
 "jed" "JED programmer's editor" "on" \
 "joe" "joe text editor" "on" \
 "jove" "Jonathan's Own Version of Emacs text editor" "on" \
@@ -54,17 +54,16 @@ done." 22 72 12 \
 "madplay" "MPEG audio player" "on" \
 "man" "Primary tool for reading online documentation" "on" \
 "man-pages" "Online documentation (requires groff)" "on" \
+"mariadb" "An enhanced, drop-in replacement for MySQL" "on" \
 "mc" "The Midnight Commander file manager" "on" \
 "moc" "A music player for the console" "on" \
 "most" "A pager, like 'more' or 'less'" "on" \
 "mpg123" "A command-line MP3 player" "on" \
-"mysql" "MySQL database server" "on" \
 "nano" "A simple editor with the look and feel of Pico" "on" \
 "normalize" "Normalize audio file volume" "on" \
 "pm-utils" "Power management utilities" "on" \
 "powertop" "PowerTOP system energy usage utility" "on" \
 "radeontool" "Utility for laptops with a Radeon chipset" "on" \
-"rexima" "Small console audio mixer" "on" \
 "rpm" "RPM package tool (unsupported)" "on" \
 "rzip" "A large file compression utility" "on" \
 "sc" "The 'sc' spreadsheet" "on" \
@@ -76,7 +75,9 @@ done." 22 72 12 \
 "sqlite" "A small SQL database server and library" "on" \
 "sudo" "Allow special users limited root access" "on" \
 "sysstat" "System performance monitoring tools" "on" \
+"terminus-font" "a clean fixed width font" "on" \
 "texinfo" "GNU texinfo documentation system" "on" \
+"tmux" "terminal multiplexer" "on" \
 "vbetool" "Video BIOS execution tool" "on" \
 "vim" "Improved vi clone" "on" \
 "vorbis-tools" "Ogg Vorbis encoder, player, and utilities" "on" \
@@ -88,7 +89,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell itstool jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mariadb mc moc most mpg123 nano normalize pm-utils powertop radeontool rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat terminus-font texinfo tmux vbetool vim vorbis-tools workbone xfsdump zsh \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -96,9 +97,9 @@ a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd dd
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell itstool jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mariadb mc moc most mpg123 nano normalize pm-utils powertop radeontool rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat terminus-font texinfo tmux vbetool vim vorbis-tools workbone xfsdump zsh \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/ap/maketag.ez b/slackware64/ap/maketag.ez
index c49ab3c10..0155925a7 100644
--- a/slackware64/ap/maketag.ez
+++ b/slackware64/ap/maketag.ez
@@ -17,7 +17,6 @@ done." 22 72 12 \
 "amp" "A command-line MP3 player" "on" \
 "ash" "A small /bin/sh type shell" "on" \
 "at" "Schedule commands to execute at a later time" "on" \
-"aumix" "Audio mixer for the console or X" "on" \
 "bc" "GNU bc - arbitrary precision math language" "on" \
 "bpe" "Binary Patch (file) Editor" "on" \
 "cdparanoia" "Cdparanoia CD audio ripper" "on" \
@@ -33,7 +32,7 @@ done." 22 72 12 \
 "enscript" "A text to PostScript utility" "on" \
 "flac" "Free Lossless Audio Codec" "on" \
 "foomatic-filters" "Print filter for gutenprint and hplip" "on" \
-"ghostscript" "GPL Ghostscript PS/PDF interpreter" "on" \
+"ghostscript" "Ghostscript PS/PDF interpreter" "on" \
 "ghostscript-fonts-std" "Ghostscript Type1 fonts" "on" \
 "gphoto2" "A command-line camera client for libgphoto2" "on" \
 "groff" "GNU groff document formatting system" "on" \
@@ -41,6 +40,7 @@ done." 22 72 12 \
 "hplip" "HP printing and scanning software" "on" \
 "htop" "An ncurses-based process viewer" "on" \
 "ispell" "The International version of ispell" "on" \
+"itstool" "Translate XML documents with PO files" "on" \
 "jed" "JED programmer's editor" "on" \
 "joe" "joe text editor" "on" \
 "jove" "Jonathan's Own Version of Emacs text editor" "on" \
@@ -54,17 +54,16 @@ done." 22 72 12 \
 "madplay" "MPEG audio player" "on" \
 "man" "Primary tool for reading online documentation" "on" \
 "man-pages" "Online documentation (requires groff)" "on" \
+"mariadb" "An enhanced, drop-in replacement for MySQL" "on" \
 "mc" "The Midnight Commander file manager" "on" \
 "moc" "A music player for the console" "on" \
 "most" "A pager, like 'more' or 'less'" "on" \
 "mpg123" "A command-line MP3 player" "on" \
-"mysql" "MySQL database server" "on" \
 "nano" "A simple editor with the look and feel of Pico" "on" \
 "normalize" "Normalize audio file volume" "on" \
 "pm-utils" "Power management utilities" "on" \
 "powertop" "PowerTOP system energy usage utility" "on" \
 "radeontool" "Utility for laptops with a Radeon chipset" "on" \
-"rexima" "Small console audio mixer" "on" \
 "rpm" "RPM package tool (unsupported)" "on" \
 "rzip" "A large file compression utility" "on" \
 "sc" "The 'sc' spreadsheet" "on" \
@@ -76,7 +75,9 @@ done." 22 72 12 \
 "sqlite" "A small SQL database server and library" "on" \
 "sudo" "Allow special users limited root access" "on" \
 "sysstat" "System performance monitoring tools" "on" \
+"terminus-font" "a clean fixed width font" "on" \
 "texinfo" "GNU texinfo documentation system" "on" \
+"tmux" "terminal multiplexer" "on" \
 "vbetool" "Video BIOS execution tool" "on" \
 "vim" "Improved vi clone" "on" \
 "vorbis-tools" "Ogg Vorbis encoder, player, and utilities" "on" \
@@ -88,7 +89,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell itstool jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mariadb mc moc most mpg123 nano normalize pm-utils powertop radeontool rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat terminus-font texinfo tmux vbetool vim vorbis-tools workbone xfsdump zsh \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -96,9 +97,9 @@ a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd dd
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell itstool jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mariadb mc moc most mpg123 nano normalize pm-utils powertop radeontool rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat terminus-font texinfo tmux vbetool vim vorbis-tools workbone xfsdump zsh \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/ap/tagfile b/slackware64/ap/tagfile
index 21b386f52..551552191 100644
--- a/slackware64/ap/tagfile
+++ b/slackware64/ap/tagfile
@@ -4,7 +4,6 @@ alsa-utils:REC
 amp:OPT
 ash:OPT
 at:OPT
-aumix:OPT
 bc:OPT
 bpe:OPT
 cdparanoia:OPT
@@ -28,6 +27,7 @@ gutenprint:OPT
 hplip:REC
 htop:REC
 ispell:OPT
+itstool:REC
 jed:OPT
 joe:OPT
 jove:OPT
@@ -41,17 +41,16 @@ lxc:OPT
 madplay:OPT
 man:ADD
 man-pages:REC
+mariadb:OPT
 mc:OPT
 moc:OPT
 most:OPT
 mpg123:OPT
-mysql:OPT
 nano:REC
 normalize:OPT
 pm-utils:OPT
 powertop:OPT
 radeontool:REC
-rexima:REC
 rpm:OPT
 rzip:OPT
 sc:OPT
@@ -63,7 +62,9 @@ sox:REC
 sqlite:OPT
 sudo:OPT
 sysstat:OPT
+terminus-font:REC
 texinfo:REC
+tmux:REC
 vbetool:REC
 vim:REC
 vorbis-tools:OPT
diff --git a/slackware64/d/maketag b/slackware64/d/maketag
index 3d4769889..8d91a810e 100644
--- a/slackware64/d/maketag
+++ b/slackware64/d/maketag
@@ -24,7 +24,7 @@ done." 22 72 12 \
 "distcc" "gcc frontend to use networked machines" "on" \
 "doxygen" "Source code documentation generator" "on" \
 "flex" "Fast lexical analyzer generator" "on" \
-"gcc" "GNU gcc-4.7.1 C compiler" "on" \
+"gcc" "GNU C compiler" "on" \
 "gcc-g++" "GNU C++ compiler for gcc" "on" \
 "gcc-gfortran" "GNU Fortran 95/2003/2008 compiler for gcc" "on" \
 "gcc-gnat" "GNU Ada83/95/2005/2012 compiler for gcc" "on" \
@@ -36,6 +36,7 @@ done." 22 72 12 \
 "git" "A directory content manager" "on" \
 "gperf" "Generates hash functions" "on" \
 "guile" "GNU extension language library" "on" \
+"help2man" "Automatic man page generator" "on" \
 "indent" "Change the indenting style of a C program" "on" \
 "intltool" "Internationalization utilities" "on" \
 "kernel-headers" "Linux kernel include files" "on" \
@@ -45,6 +46,7 @@ done." 22 72 12 \
 "make" "GNU make" "on" \
 "mercurial" "Distributed source management system" "on" \
 "nasm" "NASM assembler" "on" \
+"open-cobol" "open source COBOL compiler" "on" \
 "oprofile" "System profiling tool" "on" \
 "p2c" "A Pascal to C translator" "on" \
 "perl" "Larry Wall's systems language" "on" \
@@ -63,7 +65,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-go gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool llvm m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
+autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-go gcc-java gcc-objc gdb gettext-tools git gperf guile help2man indent intltool kernel-headers libtool llvm m4 make mercurial nasm open-cobol oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -71,9 +73,9 @@ autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxy
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-go gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool llvm m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
+autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-go gcc-java gcc-objc gdb gettext-tools git gperf guile help2man indent intltool kernel-headers libtool llvm m4 make mercurial nasm open-cobol oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/d/maketag.ez b/slackware64/d/maketag.ez
index 3d4769889..8d91a810e 100644
--- a/slackware64/d/maketag.ez
+++ b/slackware64/d/maketag.ez
@@ -24,7 +24,7 @@ done." 22 72 12 \
 "distcc" "gcc frontend to use networked machines" "on" \
 "doxygen" "Source code documentation generator" "on" \
 "flex" "Fast lexical analyzer generator" "on" \
-"gcc" "GNU gcc-4.7.1 C compiler" "on" \
+"gcc" "GNU C compiler" "on" \
 "gcc-g++" "GNU C++ compiler for gcc" "on" \
 "gcc-gfortran" "GNU Fortran 95/2003/2008 compiler for gcc" "on" \
 "gcc-gnat" "GNU Ada83/95/2005/2012 compiler for gcc" "on" \
@@ -36,6 +36,7 @@ done." 22 72 12 \
 "git" "A directory content manager" "on" \
 "gperf" "Generates hash functions" "on" \
 "guile" "GNU extension language library" "on" \
+"help2man" "Automatic man page generator" "on" \
 "indent" "Change the indenting style of a C program" "on" \
 "intltool" "Internationalization utilities" "on" \
 "kernel-headers" "Linux kernel include files" "on" \
@@ -45,6 +46,7 @@ done." 22 72 12 \
 "make" "GNU make" "on" \
 "mercurial" "Distributed source management system" "on" \
 "nasm" "NASM assembler" "on" \
+"open-cobol" "open source COBOL compiler" "on" \
 "oprofile" "System profiling tool" "on" \
 "p2c" "A Pascal to C translator" "on" \
 "perl" "Larry Wall's systems language" "on" \
@@ -63,7 +65,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-go gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool llvm m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
+autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-go gcc-java gcc-objc gdb gettext-tools git gperf guile help2man indent intltool kernel-headers libtool llvm m4 make mercurial nasm open-cobol oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -71,9 +73,9 @@ autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxy
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-go gcc-java gcc-objc gdb gettext-tools git gperf guile indent intltool kernel-headers libtool llvm m4 make mercurial nasm oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
+autoconf automake binutils bison ccache clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gfortran gcc-gnat gcc-go gcc-java gcc-objc gdb gettext-tools git gperf guile help2man indent intltool kernel-headers libtool llvm m4 make mercurial nasm open-cobol oprofile p2c perl pkg-config pmake python rcs ruby slacktrack strace subversion swig yasm \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/d/tagfile b/slackware64/d/tagfile
index 17e6daa66..f655fbd61 100644
--- a/slackware64/d/tagfile
+++ b/slackware64/d/tagfile
@@ -22,7 +22,8 @@ gdb:REC
 gettext-tools:REC
 git:REC
 gperf:REC
-guile:OPT
+guile:REC
+help2man:REC
 indent:OPT
 intltool:REC
 kernel-headers:ADD
@@ -32,6 +33,7 @@ m4:REC
 make:ADD
 mercurial:REC
 nasm:OPT
+open-cobol:OPT
 oprofile:OPT
 p2c:OPT
 perl:REC
diff --git a/slackware64/e/maketag b/slackware64/e/maketag
index 012d0cea5..979b369ae 100644
--- a/slackware64/e/maketag
+++ b/slackware64/e/maketag
@@ -11,7 +11,7 @@ from series E.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are \
 done." 16 72 6 \
-"emacs" "The GNU Emacs 24.2 system" "on" \
+"emacs" "The GNU Emacs system" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
@@ -27,7 +27,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 emacs \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/e/maketag.ez b/slackware64/e/maketag.ez
index 012d0cea5..979b369ae 100644
--- a/slackware64/e/maketag.ez
+++ b/slackware64/e/maketag.ez
@@ -11,7 +11,7 @@ from series E.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are \
 done." 16 72 6 \
-"emacs" "The GNU Emacs 24.2 system" "on" \
+"emacs" "The GNU Emacs system" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
@@ -27,7 +27,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 emacs \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/f/maketag b/slackware64/f/maketag
index 05ef4e29d..5253c14e6 100644
--- a/slackware64/f/maketag
+++ b/slackware64/f/maketag
@@ -28,7 +28,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 linux-faqs linux-howtos \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/f/maketag.ez b/slackware64/f/maketag.ez
index 05ef4e29d..5253c14e6 100644
--- a/slackware64/f/maketag.ez
+++ b/slackware64/f/maketag.ez
@@ -28,7 +28,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 linux-faqs linux-howtos \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/k/maketag b/slackware64/k/maketag
index 83e423eb3..c3d71809e 100644
--- a/slackware64/k/maketag
+++ b/slackware64/k/maketag
@@ -21,7 +21,7 @@ from series K.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are \
 done." 11 70 1 \
-"kernel-source" "Linux 3.2.29 kernel source" "on" \
+"kernel-source" "Linux 3.10.17 kernel source" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
@@ -37,7 +37,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 kernel-source \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/k/maketag.ez b/slackware64/k/maketag.ez
index 83e423eb3..c3d71809e 100644
--- a/slackware64/k/maketag.ez
+++ b/slackware64/k/maketag.ez
@@ -21,7 +21,7 @@ from series K.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are \
 done." 11 70 1 \
-"kernel-source" "Linux 3.2.29 kernel source" "on" \
+"kernel-source" "Linux 3.10.17 kernel source" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
@@ -37,7 +37,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 kernel-source \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/kde/maketag b/slackware64/kde/maketag
index cb767ce71..dac15b7b7 100644
--- a/slackware64/kde/maketag
+++ b/slackware64/kde/maketag
@@ -17,12 +17,18 @@ to install.  Press ENTER when you are done." \
 "amarok" "A media player for KDE" "on" \
 "analitza" "mathematical feature library" "on" \
 "ark" "KDE archiver tool" "on" \
+"audiocd-kio" "audiocd kio slave" "on" \
 "blinken" "a memory enhancement game" "on" \
 "bluedevil" "bluetooth stack for KDE" "on" \
+"bomber" "arcade bombing game for KDE" "on" \
+"bovo" "five-in-a-row board game" "on" \
 "calligra" "KDE office productivity suite" "on" \
 "cantor" "front-end to mathematics software" "on" \
+"dragon" "KDE multimedia player" "on" \
 "filelight" "file system monitor" "on" \
+"granatier" "bomberman clone for KDE" "on" \
 "gwenview" "image viewer" "on" \
+"juk" "audio jukebox application" "on" \
 "k3b" "CD/DVD burning app for KDE" "on" \
 "kaccessible" "KDE accessibility bridge" "on" \
 "kactivities" "API for KDE Activities" "on" \
@@ -30,24 +36,29 @@ to install.  Press ENTER when you are done." \
 "kalzium" "periodic table of the elements" "on" \
 "kamera" "Digital camera support" "on" \
 "kanagram" "letter game" "on" \
+"kapman" "KDE version of Pac-Man" "on" \
 "kate" "advanced text editor" "on" \
+"katomic" "re-assemble molecules from compound atoms" "on" \
 "kaudiocreator" "CD ripper and audio encoder" "on" \
+"kblackbox" "a game of hide and seek" "on" \
+"kblocks" "falling blocks game for KDE" "on" \
+"kbounce" "KDE Bounce Ball Game" "on" \
+"kbreakout" "breakout-like game for KDE" "on" \
 "kbruch" "calculate fractions" "on" \
 "kcalc" "KDE calculator" "on" \
 "kcharselect" "character picker" "on" \
 "kcolorchooser" "color chooser application" "on" \
+"kde-base-artwork" "KDE themes artwork" "on" \
 "kde-baseapps" "KDE core applications and files" "on" \
 "kde-runtime" "KDE runtime core" "on" \
 "kde-wallpapers" "Wallpapers for KDE" "on" \
 "kde-workspace" "KDE Plasma Desktop" "on" \
 "kdeadmin" "KDE system administration utilities" "on" \
 "kdeartwork" "Extra themes, sounds, wallpapers, and styles" "on" \
-"kdegames" "A KDE games collection" "on" \
 "kdegraphics-mobipocket" "Mobipocket support for Okular" "on" \
 "kdegraphics-strigi-analyzer" "graphics plugins for strigi" "on" \
 "kdegraphics-thumbnailers" "image thumbnailers" "on" \
 "kdelibs" "Libraries required for KDE" "on" \
-"kdemultimedia" "Multimedia programs for KDE" "on" \
 "kdenetwork" "Networking programs for KDE" "on" \
 "kdepim" "Personal Information Management tools" "on" \
 "kdepim-runtime" "KDE PIM runtime support package" "on" \
@@ -57,58 +68,101 @@ to install.  Press ENTER when you are done." \
 "kdetoys" "Toys for the KDE desktop" "on" \
 "kdevelop" "KDE Application Development Environment" "on" \
 "kdevelop-pg-qt" "KDevelop Parser Generator" "on" \
+"kdevelop-php" "PHP language plugin for KDevelop" "on" \
+"kdevelop-php-docs" "PHP documentation plugin for KDevelop" "on" \
 "kdevplatform" "Libraries used by kdevelop" "on" \
 "kdewebdev" "Quanta Plus web development environment" "on" \
 "kdf" "show available disk space" "on" \
+"kdiamond" "three-in-a-row game for KDE" "on" \
 "kfloppy" "floppy disk formatter" "on" \
+"kfourinline" "four-in-a-row board game" "on" \
 "kgamma" "display gamma configuration" "on" \
 "kgeography" "geography learning tool" "on" \
+"kgoldrunner" "Hunt gold, dodge enemies and solve puzzles" "on" \
 "kgpg" "GUI for GnuPG" "on" \
 "khangman" "classical hangman game" "on" \
 "kig" "interactive geometry game" "on" \
+"kigo" "Go board game for KDE" "on" \
+"killbots" "Robots-like game for KDE" "on" \
+"kio-mtp" "Provides KIO Access to MTP devices" "on" \
+"kiriki" "yahtzee-like dice game for KDE" "on" \
 "kiten" "a tool to learn Japanese" "on" \
+"kjumpingcube" "territory capture game" "on" \
 "klettres" "language learning program" "on" \
+"klickety" "strategy game" "on" \
+"klines" "tactical game for KDE" "on" \
 "kmag" "Screen magnifier" "on" \
+"kmahjongg" "KDE port of Mahjongg game" "on" \
+"kmines" "minesweeper clone for KDE" "on" \
+"kmix" "sound mixer" "on" \
 "kmousetool" "Automatic mouse clicks" "on" \
 "kmouth" "Speech synthesis frontend" "on" \
 "kmplot" "mathematical function plotter" "on" \
+"knavalbattle" "KDE version of battleship game" "on" \
+"knetwalk" "turn pieces to get computers connected" "on" \
+"kolf" "miniature golf game for KDE" "on" \
+"kollision" "simple ball dodging game" "on" \
 "kolourpaint" "easy to use paint program" "on" \
+"konquest" "KDE version of Gnu-Lactic Konquest" "on" \
 "konsole" "KDE terminal emulator" "on" \
 "korundum" "KDE ruby bindings" "on" \
+"kpat" "patience card game for KDE" "on" \
 "kplayer" "KDE media player" "on" \
 "kremotecontrol" "remote control frontend" "on" \
+"kreversi" "reversi board game for KDE" "on" \
+"kross-interpreters" "Kross interpreters" "on" \
 "kruler" "screen ruler for KDE" "on" \
 "ksaneplugin" "scanning plugin using libksane" "on" \
-"ksecrets" "secrets management infrastructure" "on" \
+"kscreen" "KDE screen management" "on" \
+"kshisen" "Shisen-Sho Mahjongg-like tile game" "on" \
+"ksirk" "KDE port of the board game risk" "on" \
+"ksnakeduel" "simple snake duel game for KDE" "on" \
 "ksnapshot" "screen capture program" "on" \
+"kspaceduel" "space arcade game" "on" \
+"ksquares" "connect the dots to create squares" "on" \
 "kstars" "a desktop planetarium" "on" \
+"ksudoku" "sudoku game" "on" \
 "ktimer" "program scheduler" "on" \
 "ktorrent" "BitTorrent program for KDE" "on" \
 "ktouch" "touch typing tutor" "on" \
+"ktuberling" "picture game for children" "on" \
 "kturtle" "Logo programming environment" "on" \
+"kubrick" "3-D game based on Rubik's Cube" "on" \
 "kwallet" "KDE wallet manager" "on" \
 "kwebkitpart" "WebKit browser component" "on" \
 "kwordquiz" "flash card program" "on" \
+"libkcddb" "KDE CDDB retrieval library" "on" \
+"libkcompactdisc" "KDE library for playing & ripping CDs" "on" \
 "libkdcraw" "RAW photo wrapper library" "on" \
 "libkdeedu" "library for educational apps" "on" \
+"libkdegames" "common code and data for many KDE games" "on" \
 "libkexiv2" "photo metadata library" "on" \
 "libkipi" "image plugin library" "on" \
+"libkmahjongg" "library for rendering of Mahjongg tilesets" "on" \
 "libksane" "scanner support library" "on" \
+"libkscreen" "KDE screen management library" "on" \
 "libktorrent" "KDE BitTorrent library" "on" \
+"lskat" "Lieutnant Skat card game for KDE" "on" \
 "marble" "virtual globe" "on" \
+"mplayerthumbs" "Use MPlayer for KDE video thumbnail support" "on" \
+"nepomuk-core" "Nepomuk Core utilities and libraries" "on" \
+"nepomuk-widgets" "nepomuk widgets" "on" \
 "networkmanagement" "KDE network control widget" "on" \
 "okular" "a document viewer" "on" \
 "oxygen-gtk2" "Oxygen theme for GTK+" "on" \
+"oxygen-gtk3" "Oxygen GTK+3 engine" "on" \
 "oxygen-icons" "Oxygen icon theme" "on" \
+"pairs" "a memory game" "on" \
+"palapeli" "jigsaw puzzle game" "on" \
 "parley" "vocabulary trainer" "on" \
 "perlkde" "perl bindings for KDE" "on" \
 "perlqt" "Perl OO interface to Qt" "on" \
+"picmi" "logic puzzle game" "on" \
 "polkit-kde-agent-1" "KDE polkit authenticator" "on" \
 "polkit-kde-kcmodules-1" "KDE polkit kcmodules" "on" \
-"printer-applet" "printer applet" "on" \
+"print-manager" "tool for managing print jobs and printers" "on" \
 "pykde4" "Python bindings for KDE4" "on" \
 "qtruby" "Qt bindings for ruby" "on" \
-"quanta" "Quanta Plus web development" "on" \
 "rocs" "graph theory IDE" "on" \
 "skanlite" "KDE scanning program" "on" \
 "smokegen" "SMOKE binding generator" "on" \
@@ -124,7 +178,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-amarok analitza ark blinken bluedevil calligra cantor filelight gwenview k3b kaccessible kactivities kalgebra kalzium kamera kanagram kate kaudiocreator kbruch kcalc kcharselect kcolorchooser kde-baseapps kde-runtime kde-wallpapers kde-workspace kdeadmin kdeartwork kdegames kdegraphics-mobipocket kdegraphics-strigi-analyzer kdegraphics-thumbnailers kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdevelop kdevelop-pg-qt kdevplatform kdewebdev kdf kfloppy kgamma kgeography kgpg khangman kig kiten klettres kmag kmousetool kmouth kmplot kolourpaint konsole korundum kplayer kremotecontrol kruler ksaneplugin ksecrets ksnapshot kstars ktimer ktorrent ktouch kturtle kwallet kwebkitpart kwordquiz libkdcraw libkdeedu libkexiv2 libkipi libksane libktorrent marble networkmanagement okular oxygen-gtk2 oxygen-icons parley perlkde perlqt polkit-kde-agent-1 polkit-kde-kcmodules-1 printer-applet pykde4 qtruby quanta rocs skanlite smokegen smokekde smokeqt step superkaramba svgpart sweeper wicd-kde \
+amarok analitza ark audiocd-kio blinken bluedevil bomber bovo calligra cantor dragon filelight granatier gwenview juk k3b kaccessible kactivities kalgebra kalzium kamera kanagram kapman kate katomic kaudiocreator kblackbox kblocks kbounce kbreakout kbruch kcalc kcharselect kcolorchooser kde-base-artwork kde-baseapps kde-runtime kde-wallpapers kde-workspace kdeadmin kdeartwork kdegraphics-mobipocket kdegraphics-strigi-analyzer kdegraphics-thumbnailers kdelibs kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdevelop kdevelop-pg-qt kdevelop-php kdevelop-php-docs kdevplatform kdewebdev kdf kdiamond kfloppy kfourinline kgamma kgeography kgoldrunner kgpg khangman kig kigo killbots kio-mtp kiriki kiten kjumpingcube klettres klickety klines kmag kmahjongg kmines kmix kmousetool kmouth kmplot knavalbattle knetwalk kolf kollision kolourpaint konquest konsole korundum kpat kplayer kremotecontrol kreversi kross-interpreters kruler ksaneplugin kscreen kshisen ksirk ksnakeduel ksnapshot kspaceduel ksquares kstars ksudoku ktimer ktorrent ktouch ktuberling kturtle kubrick kwallet kwebkitpart kwordquiz libkcddb libkcompactdisc libkdcraw libkdeedu libkdegames libkexiv2 libkipi libkmahjongg libksane libkscreen libktorrent lskat marble mplayerthumbs nepomuk-core nepomuk-widgets networkmanagement okular oxygen-gtk2 oxygen-gtk3 oxygen-icons pairs palapeli parley perlkde perlqt picmi polkit-kde-agent-1 polkit-kde-kcmodules-1 print-manager pykde4 qtruby rocs skanlite smokegen smokekde smokeqt step superkaramba svgpart sweeper wicd-kde \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -132,9 +186,9 @@ amarok analitza ark blinken bluedevil calligra cantor filelight gwenview k3b kac
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-amarok analitza ark blinken bluedevil calligra cantor filelight gwenview k3b kaccessible kactivities kalgebra kalzium kamera kanagram kate kaudiocreator kbruch kcalc kcharselect kcolorchooser kde-baseapps kde-runtime kde-wallpapers kde-workspace kdeadmin kdeartwork kdegames kdegraphics-mobipocket kdegraphics-strigi-analyzer kdegraphics-thumbnailers kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdevelop kdevelop-pg-qt kdevplatform kdewebdev kdf kfloppy kgamma kgeography kgpg khangman kig kiten klettres kmag kmousetool kmouth kmplot kolourpaint konsole korundum kplayer kremotecontrol kruler ksaneplugin ksecrets ksnapshot kstars ktimer ktorrent ktouch kturtle kwallet kwebkitpart kwordquiz libkdcraw libkdeedu libkexiv2 libkipi libksane libktorrent marble networkmanagement okular oxygen-gtk2 oxygen-icons parley perlkde perlqt polkit-kde-agent-1 polkit-kde-kcmodules-1 printer-applet pykde4 qtruby quanta rocs skanlite smokegen smokekde smokeqt step superkaramba svgpart sweeper wicd-kde \
+amarok analitza ark audiocd-kio blinken bluedevil bomber bovo calligra cantor dragon filelight granatier gwenview juk k3b kaccessible kactivities kalgebra kalzium kamera kanagram kapman kate katomic kaudiocreator kblackbox kblocks kbounce kbreakout kbruch kcalc kcharselect kcolorchooser kde-base-artwork kde-baseapps kde-runtime kde-wallpapers kde-workspace kdeadmin kdeartwork kdegraphics-mobipocket kdegraphics-strigi-analyzer kdegraphics-thumbnailers kdelibs kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdevelop kdevelop-pg-qt kdevelop-php kdevelop-php-docs kdevplatform kdewebdev kdf kdiamond kfloppy kfourinline kgamma kgeography kgoldrunner kgpg khangman kig kigo killbots kio-mtp kiriki kiten kjumpingcube klettres klickety klines kmag kmahjongg kmines kmix kmousetool kmouth kmplot knavalbattle knetwalk kolf kollision kolourpaint konquest konsole korundum kpat kplayer kremotecontrol kreversi kross-interpreters kruler ksaneplugin kscreen kshisen ksirk ksnakeduel ksnapshot kspaceduel ksquares kstars ksudoku ktimer ktorrent ktouch ktuberling kturtle kubrick kwallet kwebkitpart kwordquiz libkcddb libkcompactdisc libkdcraw libkdeedu libkdegames libkexiv2 libkipi libkmahjongg libksane libkscreen libktorrent lskat marble mplayerthumbs nepomuk-core nepomuk-widgets networkmanagement okular oxygen-gtk2 oxygen-gtk3 oxygen-icons pairs palapeli parley perlkde perlqt picmi polkit-kde-agent-1 polkit-kde-kcmodules-1 print-manager pykde4 qtruby rocs skanlite smokegen smokekde smokeqt step superkaramba svgpart sweeper wicd-kde \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/kde/maketag.ez b/slackware64/kde/maketag.ez
index cb767ce71..dac15b7b7 100644
--- a/slackware64/kde/maketag.ez
+++ b/slackware64/kde/maketag.ez
@@ -17,12 +17,18 @@ to install.  Press ENTER when you are done." \
 "amarok" "A media player for KDE" "on" \
 "analitza" "mathematical feature library" "on" \
 "ark" "KDE archiver tool" "on" \
+"audiocd-kio" "audiocd kio slave" "on" \
 "blinken" "a memory enhancement game" "on" \
 "bluedevil" "bluetooth stack for KDE" "on" \
+"bomber" "arcade bombing game for KDE" "on" \
+"bovo" "five-in-a-row board game" "on" \
 "calligra" "KDE office productivity suite" "on" \
 "cantor" "front-end to mathematics software" "on" \
+"dragon" "KDE multimedia player" "on" \
 "filelight" "file system monitor" "on" \
+"granatier" "bomberman clone for KDE" "on" \
 "gwenview" "image viewer" "on" \
+"juk" "audio jukebox application" "on" \
 "k3b" "CD/DVD burning app for KDE" "on" \
 "kaccessible" "KDE accessibility bridge" "on" \
 "kactivities" "API for KDE Activities" "on" \
@@ -30,24 +36,29 @@ to install.  Press ENTER when you are done." \
 "kalzium" "periodic table of the elements" "on" \
 "kamera" "Digital camera support" "on" \
 "kanagram" "letter game" "on" \
+"kapman" "KDE version of Pac-Man" "on" \
 "kate" "advanced text editor" "on" \
+"katomic" "re-assemble molecules from compound atoms" "on" \
 "kaudiocreator" "CD ripper and audio encoder" "on" \
+"kblackbox" "a game of hide and seek" "on" \
+"kblocks" "falling blocks game for KDE" "on" \
+"kbounce" "KDE Bounce Ball Game" "on" \
+"kbreakout" "breakout-like game for KDE" "on" \
 "kbruch" "calculate fractions" "on" \
 "kcalc" "KDE calculator" "on" \
 "kcharselect" "character picker" "on" \
 "kcolorchooser" "color chooser application" "on" \
+"kde-base-artwork" "KDE themes artwork" "on" \
 "kde-baseapps" "KDE core applications and files" "on" \
 "kde-runtime" "KDE runtime core" "on" \
 "kde-wallpapers" "Wallpapers for KDE" "on" \
 "kde-workspace" "KDE Plasma Desktop" "on" \
 "kdeadmin" "KDE system administration utilities" "on" \
 "kdeartwork" "Extra themes, sounds, wallpapers, and styles" "on" \
-"kdegames" "A KDE games collection" "on" \
 "kdegraphics-mobipocket" "Mobipocket support for Okular" "on" \
 "kdegraphics-strigi-analyzer" "graphics plugins for strigi" "on" \
 "kdegraphics-thumbnailers" "image thumbnailers" "on" \
 "kdelibs" "Libraries required for KDE" "on" \
-"kdemultimedia" "Multimedia programs for KDE" "on" \
 "kdenetwork" "Networking programs for KDE" "on" \
 "kdepim" "Personal Information Management tools" "on" \
 "kdepim-runtime" "KDE PIM runtime support package" "on" \
@@ -57,58 +68,101 @@ to install.  Press ENTER when you are done." \
 "kdetoys" "Toys for the KDE desktop" "on" \
 "kdevelop" "KDE Application Development Environment" "on" \
 "kdevelop-pg-qt" "KDevelop Parser Generator" "on" \
+"kdevelop-php" "PHP language plugin for KDevelop" "on" \
+"kdevelop-php-docs" "PHP documentation plugin for KDevelop" "on" \
 "kdevplatform" "Libraries used by kdevelop" "on" \
 "kdewebdev" "Quanta Plus web development environment" "on" \
 "kdf" "show available disk space" "on" \
+"kdiamond" "three-in-a-row game for KDE" "on" \
 "kfloppy" "floppy disk formatter" "on" \
+"kfourinline" "four-in-a-row board game" "on" \
 "kgamma" "display gamma configuration" "on" \
 "kgeography" "geography learning tool" "on" \
+"kgoldrunner" "Hunt gold, dodge enemies and solve puzzles" "on" \
 "kgpg" "GUI for GnuPG" "on" \
 "khangman" "classical hangman game" "on" \
 "kig" "interactive geometry game" "on" \
+"kigo" "Go board game for KDE" "on" \
+"killbots" "Robots-like game for KDE" "on" \
+"kio-mtp" "Provides KIO Access to MTP devices" "on" \
+"kiriki" "yahtzee-like dice game for KDE" "on" \
 "kiten" "a tool to learn Japanese" "on" \
+"kjumpingcube" "territory capture game" "on" \
 "klettres" "language learning program" "on" \
+"klickety" "strategy game" "on" \
+"klines" "tactical game for KDE" "on" \
 "kmag" "Screen magnifier" "on" \
+"kmahjongg" "KDE port of Mahjongg game" "on" \
+"kmines" "minesweeper clone for KDE" "on" \
+"kmix" "sound mixer" "on" \
 "kmousetool" "Automatic mouse clicks" "on" \
 "kmouth" "Speech synthesis frontend" "on" \
 "kmplot" "mathematical function plotter" "on" \
+"knavalbattle" "KDE version of battleship game" "on" \
+"knetwalk" "turn pieces to get computers connected" "on" \
+"kolf" "miniature golf game for KDE" "on" \
+"kollision" "simple ball dodging game" "on" \
 "kolourpaint" "easy to use paint program" "on" \
+"konquest" "KDE version of Gnu-Lactic Konquest" "on" \
 "konsole" "KDE terminal emulator" "on" \
 "korundum" "KDE ruby bindings" "on" \
+"kpat" "patience card game for KDE" "on" \
 "kplayer" "KDE media player" "on" \
 "kremotecontrol" "remote control frontend" "on" \
+"kreversi" "reversi board game for KDE" "on" \
+"kross-interpreters" "Kross interpreters" "on" \
 "kruler" "screen ruler for KDE" "on" \
 "ksaneplugin" "scanning plugin using libksane" "on" \
-"ksecrets" "secrets management infrastructure" "on" \
+"kscreen" "KDE screen management" "on" \
+"kshisen" "Shisen-Sho Mahjongg-like tile game" "on" \
+"ksirk" "KDE port of the board game risk" "on" \
+"ksnakeduel" "simple snake duel game for KDE" "on" \
 "ksnapshot" "screen capture program" "on" \
+"kspaceduel" "space arcade game" "on" \
+"ksquares" "connect the dots to create squares" "on" \
 "kstars" "a desktop planetarium" "on" \
+"ksudoku" "sudoku game" "on" \
 "ktimer" "program scheduler" "on" \
 "ktorrent" "BitTorrent program for KDE" "on" \
 "ktouch" "touch typing tutor" "on" \
+"ktuberling" "picture game for children" "on" \
 "kturtle" "Logo programming environment" "on" \
+"kubrick" "3-D game based on Rubik's Cube" "on" \
 "kwallet" "KDE wallet manager" "on" \
 "kwebkitpart" "WebKit browser component" "on" \
 "kwordquiz" "flash card program" "on" \
+"libkcddb" "KDE CDDB retrieval library" "on" \
+"libkcompactdisc" "KDE library for playing & ripping CDs" "on" \
 "libkdcraw" "RAW photo wrapper library" "on" \
 "libkdeedu" "library for educational apps" "on" \
+"libkdegames" "common code and data for many KDE games" "on" \
 "libkexiv2" "photo metadata library" "on" \
 "libkipi" "image plugin library" "on" \
+"libkmahjongg" "library for rendering of Mahjongg tilesets" "on" \
 "libksane" "scanner support library" "on" \
+"libkscreen" "KDE screen management library" "on" \
 "libktorrent" "KDE BitTorrent library" "on" \
+"lskat" "Lieutnant Skat card game for KDE" "on" \
 "marble" "virtual globe" "on" \
+"mplayerthumbs" "Use MPlayer for KDE video thumbnail support" "on" \
+"nepomuk-core" "Nepomuk Core utilities and libraries" "on" \
+"nepomuk-widgets" "nepomuk widgets" "on" \
 "networkmanagement" "KDE network control widget" "on" \
 "okular" "a document viewer" "on" \
 "oxygen-gtk2" "Oxygen theme for GTK+" "on" \
+"oxygen-gtk3" "Oxygen GTK+3 engine" "on" \
 "oxygen-icons" "Oxygen icon theme" "on" \
+"pairs" "a memory game" "on" \
+"palapeli" "jigsaw puzzle game" "on" \
 "parley" "vocabulary trainer" "on" \
 "perlkde" "perl bindings for KDE" "on" \
 "perlqt" "Perl OO interface to Qt" "on" \
+"picmi" "logic puzzle game" "on" \
 "polkit-kde-agent-1" "KDE polkit authenticator" "on" \
 "polkit-kde-kcmodules-1" "KDE polkit kcmodules" "on" \
-"printer-applet" "printer applet" "on" \
+"print-manager" "tool for managing print jobs and printers" "on" \
 "pykde4" "Python bindings for KDE4" "on" \
 "qtruby" "Qt bindings for ruby" "on" \
-"quanta" "Quanta Plus web development" "on" \
 "rocs" "graph theory IDE" "on" \
 "skanlite" "KDE scanning program" "on" \
 "smokegen" "SMOKE binding generator" "on" \
@@ -124,7 +178,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-amarok analitza ark blinken bluedevil calligra cantor filelight gwenview k3b kaccessible kactivities kalgebra kalzium kamera kanagram kate kaudiocreator kbruch kcalc kcharselect kcolorchooser kde-baseapps kde-runtime kde-wallpapers kde-workspace kdeadmin kdeartwork kdegames kdegraphics-mobipocket kdegraphics-strigi-analyzer kdegraphics-thumbnailers kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdevelop kdevelop-pg-qt kdevplatform kdewebdev kdf kfloppy kgamma kgeography kgpg khangman kig kiten klettres kmag kmousetool kmouth kmplot kolourpaint konsole korundum kplayer kremotecontrol kruler ksaneplugin ksecrets ksnapshot kstars ktimer ktorrent ktouch kturtle kwallet kwebkitpart kwordquiz libkdcraw libkdeedu libkexiv2 libkipi libksane libktorrent marble networkmanagement okular oxygen-gtk2 oxygen-icons parley perlkde perlqt polkit-kde-agent-1 polkit-kde-kcmodules-1 printer-applet pykde4 qtruby quanta rocs skanlite smokegen smokekde smokeqt step superkaramba svgpart sweeper wicd-kde \
+amarok analitza ark audiocd-kio blinken bluedevil bomber bovo calligra cantor dragon filelight granatier gwenview juk k3b kaccessible kactivities kalgebra kalzium kamera kanagram kapman kate katomic kaudiocreator kblackbox kblocks kbounce kbreakout kbruch kcalc kcharselect kcolorchooser kde-base-artwork kde-baseapps kde-runtime kde-wallpapers kde-workspace kdeadmin kdeartwork kdegraphics-mobipocket kdegraphics-strigi-analyzer kdegraphics-thumbnailers kdelibs kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdevelop kdevelop-pg-qt kdevelop-php kdevelop-php-docs kdevplatform kdewebdev kdf kdiamond kfloppy kfourinline kgamma kgeography kgoldrunner kgpg khangman kig kigo killbots kio-mtp kiriki kiten kjumpingcube klettres klickety klines kmag kmahjongg kmines kmix kmousetool kmouth kmplot knavalbattle knetwalk kolf kollision kolourpaint konquest konsole korundum kpat kplayer kremotecontrol kreversi kross-interpreters kruler ksaneplugin kscreen kshisen ksirk ksnakeduel ksnapshot kspaceduel ksquares kstars ksudoku ktimer ktorrent ktouch ktuberling kturtle kubrick kwallet kwebkitpart kwordquiz libkcddb libkcompactdisc libkdcraw libkdeedu libkdegames libkexiv2 libkipi libkmahjongg libksane libkscreen libktorrent lskat marble mplayerthumbs nepomuk-core nepomuk-widgets networkmanagement okular oxygen-gtk2 oxygen-gtk3 oxygen-icons pairs palapeli parley perlkde perlqt picmi polkit-kde-agent-1 polkit-kde-kcmodules-1 print-manager pykde4 qtruby rocs skanlite smokegen smokekde smokeqt step superkaramba svgpart sweeper wicd-kde \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -132,9 +186,9 @@ amarok analitza ark blinken bluedevil calligra cantor filelight gwenview k3b kac
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-amarok analitza ark blinken bluedevil calligra cantor filelight gwenview k3b kaccessible kactivities kalgebra kalzium kamera kanagram kate kaudiocreator kbruch kcalc kcharselect kcolorchooser kde-baseapps kde-runtime kde-wallpapers kde-workspace kdeadmin kdeartwork kdegames kdegraphics-mobipocket kdegraphics-strigi-analyzer kdegraphics-thumbnailers kdelibs kdemultimedia kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdevelop kdevelop-pg-qt kdevplatform kdewebdev kdf kfloppy kgamma kgeography kgpg khangman kig kiten klettres kmag kmousetool kmouth kmplot kolourpaint konsole korundum kplayer kremotecontrol kruler ksaneplugin ksecrets ksnapshot kstars ktimer ktorrent ktouch kturtle kwallet kwebkitpart kwordquiz libkdcraw libkdeedu libkexiv2 libkipi libksane libktorrent marble networkmanagement okular oxygen-gtk2 oxygen-icons parley perlkde perlqt polkit-kde-agent-1 polkit-kde-kcmodules-1 printer-applet pykde4 qtruby quanta rocs skanlite smokegen smokekde smokeqt step superkaramba svgpart sweeper wicd-kde \
+amarok analitza ark audiocd-kio blinken bluedevil bomber bovo calligra cantor dragon filelight granatier gwenview juk k3b kaccessible kactivities kalgebra kalzium kamera kanagram kapman kate katomic kaudiocreator kblackbox kblocks kbounce kbreakout kbruch kcalc kcharselect kcolorchooser kde-base-artwork kde-baseapps kde-runtime kde-wallpapers kde-workspace kdeadmin kdeartwork kdegraphics-mobipocket kdegraphics-strigi-analyzer kdegraphics-thumbnailers kdelibs kdenetwork kdepim kdepim-runtime kdepimlibs kdeplasma-addons kdesdk kdetoys kdevelop kdevelop-pg-qt kdevelop-php kdevelop-php-docs kdevplatform kdewebdev kdf kdiamond kfloppy kfourinline kgamma kgeography kgoldrunner kgpg khangman kig kigo killbots kio-mtp kiriki kiten kjumpingcube klettres klickety klines kmag kmahjongg kmines kmix kmousetool kmouth kmplot knavalbattle knetwalk kolf kollision kolourpaint konquest konsole korundum kpat kplayer kremotecontrol kreversi kross-interpreters kruler ksaneplugin kscreen kshisen ksirk ksnakeduel ksnapshot kspaceduel ksquares kstars ksudoku ktimer ktorrent ktouch ktuberling kturtle kubrick kwallet kwebkitpart kwordquiz libkcddb libkcompactdisc libkdcraw libkdeedu libkdegames libkexiv2 libkipi libkmahjongg libksane libkscreen libktorrent lskat marble mplayerthumbs nepomuk-core nepomuk-widgets networkmanagement okular oxygen-gtk2 oxygen-gtk3 oxygen-icons pairs palapeli parley perlkde perlqt picmi polkit-kde-agent-1 polkit-kde-kcmodules-1 print-manager pykde4 qtruby rocs skanlite smokegen smokekde smokeqt step superkaramba svgpart sweeper wicd-kde \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/kde/tagfile b/slackware64/kde/tagfile
index f81ec6b40..b14b3599d 100644
--- a/slackware64/kde/tagfile
+++ b/slackware64/kde/tagfile
@@ -1,12 +1,18 @@
 amarok:OPT
 analitza:REC
 ark:REC
+audiocd-kio:REC
 blinken:REC
 bluedevil:REC
+bomber:REC
+bovo:REC
 calligra:REC
 cantor:REC
+dragon:REC
 filelight:REC
+granatier:REC
 gwenview:REC
+juk:REC
 k3b:OPT
 kaccessible:REC
 kactivities:REC
@@ -14,24 +20,29 @@ kalgebra:REC
 kalzium:REC
 kamera:REC
 kanagram:REC
+kapman:REC
 kate:REC
+katomic:REC
 kaudiocreator:REC
+kblackbox:REC
+kblocks:REC
+kbounce:REC
+kbreakout:REC
 kbruch:REC
 kcalc:REC
 kcharselect:REC
 kcolorchooser:REC
+kde-base-artwork:REC
 kde-baseapps:REC
 kde-runtime:REC
 kde-wallpapers:REC
 kde-workspace:REC
 kdeadmin:ADD
 kdeartwork:ADD
-kdegames:REC
 kdegraphics-mobipocket:REC
 kdegraphics-strigi-analyzer:REC
 kdegraphics-thumbnailers:REC
 kdelibs:ADD
-kdemultimedia:REC
 kdenetwork:REC
 kdepim:REC
 kdepim-runtime:REC
@@ -41,58 +52,101 @@ kdesdk:OPT
 kdetoys:REC
 kdevelop:OPT
 kdevelop-pg-qt:REC
+kdevelop-php:OPT
+kdevelop-php-docs:OPT
 kdevplatform:OPT
 kdewebdev:OPT
 kdf:REC
+kdiamond:REC
 kfloppy:REC
+kfourinline:REC
 kgamma:REC
 kgeography:REC
+kgoldrunner:REC
 kgpg:REC
 khangman:REC
 kig:REC
+kigo:REC
+killbots:REC
+kio-mtp:REC
+kiriki:REC
 kiten:REC
+kjumpingcube:REC
 klettres:REC
+klickety:REC
+klines:REC
 kmag:REC
+kmahjongg:REC
+kmines:REC
+kmix:REC
 kmousetool:REC
 kmouth:REC
 kmplot:REC
+knavalbattle:REC
+knetwalk:REC
+kolf:REC
+kollision:REC
 kolourpaint:REC
+konquest:REC
 konsole:REC
 korundum:REC
+kpat:REC
 kplayer:REC
 kremotecontrol:REC
+kreversi:REC
+kross-interpreters:REC
 kruler:REC
 ksaneplugin:REC
-ksecrets:REC
+kscreen:REC
+kshisen:REC
+ksirk:REC
+ksnakeduel:REC
 ksnapshot:REC
+kspaceduel:REC
+ksquares:REC
 kstars:REC
+ksudoku:REC
 ktimer:REC
 ktorrent:REC
 ktouch:REC
+ktuberling:REC
 kturtle:REC
+kubrick:REC
 kwallet:REC
 kwebkitpart:REC
 kwordquiz:REC
+libkcddb:REC
+libkcompactdisc:REC
 libkdcraw:REC
 libkdeedu:REC
+libkdegames:REC
 libkexiv2:REC
 libkipi:REC
+libkmahjongg:REC
 libksane:REC
+libkscreen:REC
 libktorrent:REC
+lskat:REC
 marble:REC
+mplayerthumbs:OPT
+nepomuk-core:REC
+nepomuk-widgets:REC
 networkmanagement:REC
 okular:REC
 oxygen-gtk2:REC
+oxygen-gtk3:REC
 oxygen-icons:REC
+pairs:REC
+palapeli:REC
 parley:REC
 perlkde:REC
 perlqt:REC
+picmi:REC
 polkit-kde-agent-1:REC
 polkit-kde-kcmodules-1:REC
-printer-applet:REC
+print-manager:REC
 pykde4:REC
 qtruby:REC
-quanta:REC
 rocs:REC
 skanlite:REC
 smokegen:REC
diff --git a/slackware64/kdei/maketag b/slackware64/kdei/maketag
index eece6bf0f..40dee5661 100644
--- a/slackware64/kdei/maketag
+++ b/slackware64/kdei/maketag
@@ -11,18 +11,20 @@ within KDE for languages other than US English, please \
 select them from the list below. \
 Press ENTER \
 when you are done." 21 74 12 \
+"calligra-l10n-bs" "Bosnian language support" "off" \
 "calligra-l10n-ca" "Catalan language support" "off" \
 "calligra-l10n-ca@valencia" "Valencian (southern Catalan) language support" "off" \
 "calligra-l10n-cs" "Czech language support" "off" \
 "calligra-l10n-da" "Danish language support" "off" \
 "calligra-l10n-de" "German language support" "off" \
 "calligra-l10n-el" "Greek language support" "off" \
-"calligra-l10n-en_GB" "English (UK) language support" "off" \
 "calligra-l10n-es" "Spanish language support" "off" \
 "calligra-l10n-et" "Estonian language support" "off" \
 "calligra-l10n-fi" "Finnish language support" "off" \
 "calligra-l10n-fr" "French language support" "off" \
+"calligra-l10n-gl" "Galician language support" "off" \
 "calligra-l10n-hu" "Hungarian language support" "off" \
+"calligra-l10n-ia" "Interlingua language support" "off" \
 "calligra-l10n-it" "Italian language support" "off" \
 "calligra-l10n-kk" "Kazakh language support" "off" \
 "calligra-l10n-nb" "Norwegian (Bokmaal) language support" "off" \
@@ -33,7 +35,9 @@ when you are done." 21 74 12 \
 "calligra-l10n-pt_BR" "Brazil Portuguese language support" "off" \
 "calligra-l10n-ru" "Russian language support" "off" \
 "calligra-l10n-sk" "Slovak language support" "off" \
+"calligra-l10n-sl" "Slovenian language support" "off" \
 "calligra-l10n-sv" "Swedish language support" "off" \
+"calligra-l10n-tr" "Turkish language support" "off" \
 "calligra-l10n-uk" "Ukrainian language support" "off" \
 "calligra-l10n-zh_CN" "Simplified Chinese language support" "off" \
 "calligra-l10n-zh_TW" "Chinese language support" "off" \
@@ -56,10 +60,10 @@ when you are done." 21 74 12 \
 "kde-l10n-ga" "Irish language support" "off" \
 "kde-l10n-gl" "Galician language support" "off" \
 "kde-l10n-he" "Hebrew language support" "off" \
+"kde-l10n-hi" "Hindi language support" "off" \
 "kde-l10n-hr" "Croatian language support" "off" \
 "kde-l10n-hu" "Hungarian language support" "off" \
 "kde-l10n-ia" "Interlingua language support" "off" \
-"kde-l10n-id" "Indonesian language support" "off" \
 "kde-l10n-is" "Icelandic language support" "off" \
 "kde-l10n-it" "Italian language support" "off" \
 "kde-l10n-ja" "Japanese language support" "off" \
@@ -68,6 +72,7 @@ when you are done." 21 74 12 \
 "kde-l10n-ko" "Korean language support" "off" \
 "kde-l10n-lt" "Lithuanian language support" "off" \
 "kde-l10n-lv" "Latvian language support" "off" \
+"kde-l10n-mr" "Marathi language support" "off" \
 "kde-l10n-nb" "Norwegian (Bokmaal) language support" "off" \
 "kde-l10n-nds" "Low Saxon language support" "off" \
 "kde-l10n-nl" "Dutch language support" "off" \
@@ -97,7 +102,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-calligra-l10n-ca calligra-l10n-ca@valencia calligra-l10n-cs calligra-l10n-da calligra-l10n-de calligra-l10n-el calligra-l10n-en_GB calligra-l10n-es calligra-l10n-et calligra-l10n-fi calligra-l10n-fr calligra-l10n-hu calligra-l10n-it calligra-l10n-kk calligra-l10n-nb calligra-l10n-nds calligra-l10n-nl calligra-l10n-pl calligra-l10n-pt calligra-l10n-pt_BR calligra-l10n-ru calligra-l10n-sk calligra-l10n-sv calligra-l10n-uk calligra-l10n-zh_CN calligra-l10n-zh_TW kde-l10n-ar kde-l10n-bg kde-l10n-bs kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fa kde-l10n-fi kde-l10n-fr kde-l10n-ga kde-l10n-gl kde-l10n-he kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-th kde-l10n-tr kde-l10n-ug kde-l10n-uk kde-l10n-vi kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW \
+calligra-l10n-bs calligra-l10n-ca calligra-l10n-ca@valencia calligra-l10n-cs calligra-l10n-da calligra-l10n-de calligra-l10n-el calligra-l10n-es calligra-l10n-et calligra-l10n-fi calligra-l10n-fr calligra-l10n-gl calligra-l10n-hu calligra-l10n-ia calligra-l10n-it calligra-l10n-kk calligra-l10n-nb calligra-l10n-nds calligra-l10n-nl calligra-l10n-pl calligra-l10n-pt calligra-l10n-pt_BR calligra-l10n-ru calligra-l10n-sk calligra-l10n-sl calligra-l10n-sv calligra-l10n-tr calligra-l10n-uk calligra-l10n-zh_CN calligra-l10n-zh_TW kde-l10n-ar kde-l10n-bg kde-l10n-bs kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fa kde-l10n-fi kde-l10n-fr kde-l10n-ga kde-l10n-gl kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-mr kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-th kde-l10n-tr kde-l10n-ug kde-l10n-uk kde-l10n-vi kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -105,9 +110,9 @@ calligra-l10n-ca calligra-l10n-ca@valencia calligra-l10n-cs calligra-l10n-da cal
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-calligra-l10n-ca calligra-l10n-ca@valencia calligra-l10n-cs calligra-l10n-da calligra-l10n-de calligra-l10n-el calligra-l10n-en_GB calligra-l10n-es calligra-l10n-et calligra-l10n-fi calligra-l10n-fr calligra-l10n-hu calligra-l10n-it calligra-l10n-kk calligra-l10n-nb calligra-l10n-nds calligra-l10n-nl calligra-l10n-pl calligra-l10n-pt calligra-l10n-pt_BR calligra-l10n-ru calligra-l10n-sk calligra-l10n-sv calligra-l10n-uk calligra-l10n-zh_CN calligra-l10n-zh_TW kde-l10n-ar kde-l10n-bg kde-l10n-bs kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fa kde-l10n-fi kde-l10n-fr kde-l10n-ga kde-l10n-gl kde-l10n-he kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-th kde-l10n-tr kde-l10n-ug kde-l10n-uk kde-l10n-vi kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW \
+calligra-l10n-bs calligra-l10n-ca calligra-l10n-ca@valencia calligra-l10n-cs calligra-l10n-da calligra-l10n-de calligra-l10n-el calligra-l10n-es calligra-l10n-et calligra-l10n-fi calligra-l10n-fr calligra-l10n-gl calligra-l10n-hu calligra-l10n-ia calligra-l10n-it calligra-l10n-kk calligra-l10n-nb calligra-l10n-nds calligra-l10n-nl calligra-l10n-pl calligra-l10n-pt calligra-l10n-pt_BR calligra-l10n-ru calligra-l10n-sk calligra-l10n-sl calligra-l10n-sv calligra-l10n-tr calligra-l10n-uk calligra-l10n-zh_CN calligra-l10n-zh_TW kde-l10n-ar kde-l10n-bg kde-l10n-bs kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fa kde-l10n-fi kde-l10n-fr kde-l10n-ga kde-l10n-gl kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-mr kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-th kde-l10n-tr kde-l10n-ug kde-l10n-uk kde-l10n-vi kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/kdei/maketag.ez b/slackware64/kdei/maketag.ez
index eece6bf0f..40dee5661 100644
--- a/slackware64/kdei/maketag.ez
+++ b/slackware64/kdei/maketag.ez
@@ -11,18 +11,20 @@ within KDE for languages other than US English, please \
 select them from the list below. \
 Press ENTER \
 when you are done." 21 74 12 \
+"calligra-l10n-bs" "Bosnian language support" "off" \
 "calligra-l10n-ca" "Catalan language support" "off" \
 "calligra-l10n-ca@valencia" "Valencian (southern Catalan) language support" "off" \
 "calligra-l10n-cs" "Czech language support" "off" \
 "calligra-l10n-da" "Danish language support" "off" \
 "calligra-l10n-de" "German language support" "off" \
 "calligra-l10n-el" "Greek language support" "off" \
-"calligra-l10n-en_GB" "English (UK) language support" "off" \
 "calligra-l10n-es" "Spanish language support" "off" \
 "calligra-l10n-et" "Estonian language support" "off" \
 "calligra-l10n-fi" "Finnish language support" "off" \
 "calligra-l10n-fr" "French language support" "off" \
+"calligra-l10n-gl" "Galician language support" "off" \
 "calligra-l10n-hu" "Hungarian language support" "off" \
+"calligra-l10n-ia" "Interlingua language support" "off" \
 "calligra-l10n-it" "Italian language support" "off" \
 "calligra-l10n-kk" "Kazakh language support" "off" \
 "calligra-l10n-nb" "Norwegian (Bokmaal) language support" "off" \
@@ -33,7 +35,9 @@ when you are done." 21 74 12 \
 "calligra-l10n-pt_BR" "Brazil Portuguese language support" "off" \
 "calligra-l10n-ru" "Russian language support" "off" \
 "calligra-l10n-sk" "Slovak language support" "off" \
+"calligra-l10n-sl" "Slovenian language support" "off" \
 "calligra-l10n-sv" "Swedish language support" "off" \
+"calligra-l10n-tr" "Turkish language support" "off" \
 "calligra-l10n-uk" "Ukrainian language support" "off" \
 "calligra-l10n-zh_CN" "Simplified Chinese language support" "off" \
 "calligra-l10n-zh_TW" "Chinese language support" "off" \
@@ -56,10 +60,10 @@ when you are done." 21 74 12 \
 "kde-l10n-ga" "Irish language support" "off" \
 "kde-l10n-gl" "Galician language support" "off" \
 "kde-l10n-he" "Hebrew language support" "off" \
+"kde-l10n-hi" "Hindi language support" "off" \
 "kde-l10n-hr" "Croatian language support" "off" \
 "kde-l10n-hu" "Hungarian language support" "off" \
 "kde-l10n-ia" "Interlingua language support" "off" \
-"kde-l10n-id" "Indonesian language support" "off" \
 "kde-l10n-is" "Icelandic language support" "off" \
 "kde-l10n-it" "Italian language support" "off" \
 "kde-l10n-ja" "Japanese language support" "off" \
@@ -68,6 +72,7 @@ when you are done." 21 74 12 \
 "kde-l10n-ko" "Korean language support" "off" \
 "kde-l10n-lt" "Lithuanian language support" "off" \
 "kde-l10n-lv" "Latvian language support" "off" \
+"kde-l10n-mr" "Marathi language support" "off" \
 "kde-l10n-nb" "Norwegian (Bokmaal) language support" "off" \
 "kde-l10n-nds" "Low Saxon language support" "off" \
 "kde-l10n-nl" "Dutch language support" "off" \
@@ -97,7 +102,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-calligra-l10n-ca calligra-l10n-ca@valencia calligra-l10n-cs calligra-l10n-da calligra-l10n-de calligra-l10n-el calligra-l10n-en_GB calligra-l10n-es calligra-l10n-et calligra-l10n-fi calligra-l10n-fr calligra-l10n-hu calligra-l10n-it calligra-l10n-kk calligra-l10n-nb calligra-l10n-nds calligra-l10n-nl calligra-l10n-pl calligra-l10n-pt calligra-l10n-pt_BR calligra-l10n-ru calligra-l10n-sk calligra-l10n-sv calligra-l10n-uk calligra-l10n-zh_CN calligra-l10n-zh_TW kde-l10n-ar kde-l10n-bg kde-l10n-bs kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fa kde-l10n-fi kde-l10n-fr kde-l10n-ga kde-l10n-gl kde-l10n-he kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-th kde-l10n-tr kde-l10n-ug kde-l10n-uk kde-l10n-vi kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW \
+calligra-l10n-bs calligra-l10n-ca calligra-l10n-ca@valencia calligra-l10n-cs calligra-l10n-da calligra-l10n-de calligra-l10n-el calligra-l10n-es calligra-l10n-et calligra-l10n-fi calligra-l10n-fr calligra-l10n-gl calligra-l10n-hu calligra-l10n-ia calligra-l10n-it calligra-l10n-kk calligra-l10n-nb calligra-l10n-nds calligra-l10n-nl calligra-l10n-pl calligra-l10n-pt calligra-l10n-pt_BR calligra-l10n-ru calligra-l10n-sk calligra-l10n-sl calligra-l10n-sv calligra-l10n-tr calligra-l10n-uk calligra-l10n-zh_CN calligra-l10n-zh_TW kde-l10n-ar kde-l10n-bg kde-l10n-bs kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fa kde-l10n-fi kde-l10n-fr kde-l10n-ga kde-l10n-gl kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-mr kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-th kde-l10n-tr kde-l10n-ug kde-l10n-uk kde-l10n-vi kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -105,9 +110,9 @@ calligra-l10n-ca calligra-l10n-ca@valencia calligra-l10n-cs calligra-l10n-da cal
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-calligra-l10n-ca calligra-l10n-ca@valencia calligra-l10n-cs calligra-l10n-da calligra-l10n-de calligra-l10n-el calligra-l10n-en_GB calligra-l10n-es calligra-l10n-et calligra-l10n-fi calligra-l10n-fr calligra-l10n-hu calligra-l10n-it calligra-l10n-kk calligra-l10n-nb calligra-l10n-nds calligra-l10n-nl calligra-l10n-pl calligra-l10n-pt calligra-l10n-pt_BR calligra-l10n-ru calligra-l10n-sk calligra-l10n-sv calligra-l10n-uk calligra-l10n-zh_CN calligra-l10n-zh_TW kde-l10n-ar kde-l10n-bg kde-l10n-bs kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fa kde-l10n-fi kde-l10n-fr kde-l10n-ga kde-l10n-gl kde-l10n-he kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-id kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-th kde-l10n-tr kde-l10n-ug kde-l10n-uk kde-l10n-vi kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW \
+calligra-l10n-bs calligra-l10n-ca calligra-l10n-ca@valencia calligra-l10n-cs calligra-l10n-da calligra-l10n-de calligra-l10n-el calligra-l10n-es calligra-l10n-et calligra-l10n-fi calligra-l10n-fr calligra-l10n-gl calligra-l10n-hu calligra-l10n-ia calligra-l10n-it calligra-l10n-kk calligra-l10n-nb calligra-l10n-nds calligra-l10n-nl calligra-l10n-pl calligra-l10n-pt calligra-l10n-pt_BR calligra-l10n-ru calligra-l10n-sk calligra-l10n-sl calligra-l10n-sv calligra-l10n-tr calligra-l10n-uk calligra-l10n-zh_CN calligra-l10n-zh_TW kde-l10n-ar kde-l10n-bg kde-l10n-bs kde-l10n-ca kde-l10n-ca@valencia kde-l10n-cs kde-l10n-da kde-l10n-de kde-l10n-el kde-l10n-en_GB kde-l10n-es kde-l10n-et kde-l10n-eu kde-l10n-fa kde-l10n-fi kde-l10n-fr kde-l10n-ga kde-l10n-gl kde-l10n-he kde-l10n-hi kde-l10n-hr kde-l10n-hu kde-l10n-ia kde-l10n-is kde-l10n-it kde-l10n-ja kde-l10n-kk kde-l10n-km kde-l10n-ko kde-l10n-lt kde-l10n-lv kde-l10n-mr kde-l10n-nb kde-l10n-nds kde-l10n-nl kde-l10n-nn kde-l10n-pa kde-l10n-pl kde-l10n-pt kde-l10n-pt_BR kde-l10n-ro kde-l10n-ru kde-l10n-si kde-l10n-sk kde-l10n-sl kde-l10n-sr kde-l10n-sv kde-l10n-tg kde-l10n-th kde-l10n-tr kde-l10n-ug kde-l10n-uk kde-l10n-vi kde-l10n-wa kde-l10n-zh_CN kde-l10n-zh_TW \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/kdei/tagfile b/slackware64/kdei/tagfile
index 2bb169aee..ae08a5511 100644
--- a/slackware64/kdei/tagfile
+++ b/slackware64/kdei/tagfile
@@ -1,15 +1,17 @@
+calligra-l10n-bs:OPT
 calligra-l10n-ca:OPT
 calligra-l10n-ca@valencia:OPT
 calligra-l10n-cs:OPT
 calligra-l10n-da:OPT
 calligra-l10n-de:OPT
 calligra-l10n-el:OPT
-calligra-l10n-en_GB:OPT
 calligra-l10n-es:OPT
 calligra-l10n-et:OPT
 calligra-l10n-fi:OPT
 calligra-l10n-fr:OPT
+calligra-l10n-gl:OPT
 calligra-l10n-hu:OPT
+calligra-l10n-ia:OPT
 calligra-l10n-it:OPT
 calligra-l10n-kk:OPT
 calligra-l10n-nb:OPT
@@ -20,7 +22,9 @@ calligra-l10n-pt:OPT
 calligra-l10n-pt_BR:OPT
 calligra-l10n-ru:OPT
 calligra-l10n-sk:OPT
+calligra-l10n-sl:OPT
 calligra-l10n-sv:OPT
+calligra-l10n-tr:OPT
 calligra-l10n-uk:OPT
 calligra-l10n-zh_CN:OPT
 calligra-l10n-zh_TW:OPT
@@ -43,10 +47,10 @@ kde-l10n-fr:OPT
 kde-l10n-ga:OPT
 kde-l10n-gl:OPT
 kde-l10n-he:OPT
+kde-l10n-hi:OPT
 kde-l10n-hr:OPT
 kde-l10n-hu:OPT
 kde-l10n-ia:OPT
-kde-l10n-id:OPT
 kde-l10n-is:OPT
 kde-l10n-it:OPT
 kde-l10n-ja:OPT
@@ -55,6 +59,7 @@ kde-l10n-km:OPT
 kde-l10n-ko:OPT
 kde-l10n-lt:OPT
 kde-l10n-lv:OPT
+kde-l10n-mr:OPT
 kde-l10n-nb:OPT
 kde-l10n-nds:OPT
 kde-l10n-nl:OPT
diff --git a/slackware64/l/maketag b/slackware64/l/maketag
index c325caa5f..4547352ff 100644
--- a/slackware64/l/maketag
+++ b/slackware64/l/maketag
@@ -26,6 +26,8 @@ you are done." 22 74 10 \
 "apr-util" "Extra APR library interfaces" "on" \
 "aspell" "Spell checking library" "on" \
 "aspell-en" "English word list for Aspell" "on" \
+"at-spi2-atk" "AT-SPI2 bridge to ATK" "on" \
+"at-spi2-core" "Assistive Technology Interface core" "on" \
 "atk" "Accessability library" "on" \
 "attica" "Qt Collaboration library" "on" \
 "audiofile" "SGI's Audio File sound library" "on" \
@@ -40,6 +42,7 @@ you are done." 22 74 10 \
 "db48" "Berkeley DB library, version 4.8" "on" \
 "dbus-glib" "glib bindings for the dbus IPC library" "on" \
 "dbus-python" "Python bindings for the D-Bus library" "on" \
+"dconf" "low-level configuration system" "on" \
 "desktop-file-utils" "Tools for .desktop files" "on" \
 "djvulibre" "Web-centric document and image format" "on" \
 "ebook-tools" "Tools for ebook file formats" "on" \
@@ -53,6 +56,7 @@ you are done." 22 74 10 \
 "fribidi" "Unicode BiDirectional library" "on" \
 "fuse" "Tools for using filesystems in userspace" "on" \
 "gamin" "a minimalist FAM replacement" "on" \
+"gc" "Boehm-Demers-Weiser garbage collector library" "on" \
 "gcr" "crypto library and ui for gnome-keyring" "on" \
 "gd" "A graphics library" "on" \
 "gdbm" "The GNU gdbm database library" "on" \
@@ -71,6 +75,8 @@ you are done." 22 74 10 \
 "gmp" "A library for arithmetic" "on" \
 "gnome-icon-theme" "Icons for GTK+ applications" "on" \
 "gnome-keyring" "a tool to handle security credentials" "on" \
+"gnome-themes-standard" "Default icons used by many GTK+ applications" "on" \
+"gnu-efi" "EFI Development files for the GNU toolchain" "on" \
 "gobject-introspection" "GObject interface introspection library" "on" \
 "grantlee" "String Template system based on Qt" "on" \
 "gsettings-desktop-schemas" "GSettings schemas" "on" \
@@ -82,6 +88,7 @@ you are done." 22 74 10 \
 "gtk+3" "GTK+ version 3" "on" \
 "gtkspell" "GTK+ spell checker interface library" "on" \
 "gvfs" "glib virtual filesystems" "on" \
+"harfbuzz" "OpenType text shaping engine" "on" \
 "herqq" "UPnP Device Architecture library" "on" \
 "hicolor-icon-theme" "Standard icon theme tree" "on" \
 "hunspell" "Spell checker and morphological analyzer" "on" \
@@ -113,6 +120,7 @@ you are done." 22 74 10 \
 "libdiscid" "Library to generate DiscIDs from audio CDs" "on" \
 "libdvdread" "Library for reading DVDs" "on" \
 "libelf" "ELF object file access library" "on" \
+"libevent" "event loop library" "on" \
 "libexif" "EXIF (image information) library" "on" \
 "libffi" "Foreign Function Interface library" "on" \
 "libglade" "An interface construction library" "on" \
@@ -151,6 +159,7 @@ you are done." 22 74 10 \
 "libraw1394" "User space IEEE 1394 driver" "on" \
 "librsvg" "Scalable Vector Graphics library" "on" \
 "libsamplerate" "Digital audio resampling library" "on" \
+"libsecret" "library to access the Secret Service API" "on" \
 "libsndfile" "A library for handling digital audio files" "on" \
 "libsoup" "an HTTP client/server library" "on" \
 "libspectre" "Ghostscript wrapper library" "on" \
@@ -159,6 +168,7 @@ you are done." 22 74 10 \
 "libtermcap" "GNU terminal control library" "on" \
 "libtheora" "Theora video codec library" "on" \
 "libtiff" "Tag Image File format library" "on" \
+"libunistring" "GNU Unicode string library" "on" \
 "libusb" "A library for accessing USB devices" "on" \
 "libusb-compat" "Compat library for the old libusb API/ABI" "on" \
 "libvisual" "Audio visualization library" "on" \
@@ -212,6 +222,7 @@ you are done." 22 74 10 \
 "qca-gnupg" "GnuPG plugin for QCA" "on" \
 "qca-ossl" "OpenSSL plugin for QCA" "on" \
 "qimageblitz" "Graphical effect/filter library for KDE4" "on" \
+"qjson" "manage JSON objects with Qt" "on" \
 "qt" "C++ GUI library used by KDE" "on" \
 "qtscriptgenerator" "Qt API Bindings for QtScript" "on" \
 "raptor2" "RDF parser and serializer" "on" \
@@ -248,7 +259,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-ConsoleKit GConf M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 db48 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gcr gd gdbm gdk-pixbuf2 gegl giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gnome-keyring gobject-introspection grantlee gsettings-desktop-schemas gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtk+3 gtkspell gvfs herqq hicolor-icon-theme hunspell icon-naming-utils icu4c ilmbase imlib iso-codes jasper js185 keybinder keyutils lcms lcms2 lesstif libaio libao libarchive libart_lgpl libatasmart libbluedevil libcaca libcanberra libcap libcddb libcdio libcroco libdbusmenu-qt libdiscid libdvdread libelf libexif libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnl3 libnotify libogg liboggz liboil libpcap libplist libpng libproxy libraw1394 librsvg libsamplerate libsndfile libsoup libspectre libssh libtasn1 libtermcap libtheora libtiff libusb libusb-compat libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libyaml libzip loudmouth lzo media-player-info mhash mm mozilla-nss mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-gstreamer phonon-mplayer phonon-xine pil pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pycairo pycups pycurl pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor2 rasqal readline redland sdl seamonkey-solibs sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack zlib \
+ConsoleKit GConf M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en at-spi2-atk at-spi2-core atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 db48 dbus-glib dbus-python dconf desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gc gcr gd gdbm gdk-pixbuf2 gegl giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gnome-keyring gnome-themes-standard gnu-efi gobject-introspection grantlee gsettings-desktop-schemas gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtk+3 gtkspell gvfs harfbuzz herqq hicolor-icon-theme hunspell icon-naming-utils icu4c ilmbase imlib iso-codes jasper js185 keybinder keyutils lcms lcms2 lesstif libaio libao libarchive libart_lgpl libatasmart libbluedevil libcaca libcanberra libcap libcddb libcdio libcroco libdbusmenu-qt libdiscid libdvdread libelf libevent libexif libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnl3 libnotify libogg liboggz liboil libpcap libplist libpng libproxy libraw1394 librsvg libsamplerate libsecret libsndfile libsoup libspectre libssh libtasn1 libtermcap libtheora libtiff libunistring libusb libusb-compat libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libyaml libzip loudmouth lzo media-player-info mhash mm mozilla-nss mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-gstreamer phonon-mplayer phonon-xine pil pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pycairo pycups pycurl pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qjson qt qtscriptgenerator raptor2 rasqal readline redland sdl seamonkey-solibs sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack zlib \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -256,9 +267,9 @@ ConsoleKit GConf M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr ap
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-ConsoleKit GConf M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 db48 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gcr gd gdbm gdk-pixbuf2 gegl giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gnome-keyring gobject-introspection grantlee gsettings-desktop-schemas gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtk+3 gtkspell gvfs herqq hicolor-icon-theme hunspell icon-naming-utils icu4c ilmbase imlib iso-codes jasper js185 keybinder keyutils lcms lcms2 lesstif libaio libao libarchive libart_lgpl libatasmart libbluedevil libcaca libcanberra libcap libcddb libcdio libcroco libdbusmenu-qt libdiscid libdvdread libelf libexif libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnl3 libnotify libogg liboggz liboil libpcap libplist libpng libproxy libraw1394 librsvg libsamplerate libsndfile libsoup libspectre libssh libtasn1 libtermcap libtheora libtiff libusb libusb-compat libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libyaml libzip loudmouth lzo media-player-info mhash mm mozilla-nss mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-gstreamer phonon-mplayer phonon-xine pil pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pycairo pycups pycurl pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor2 rasqal readline redland sdl seamonkey-solibs sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack zlib \
+ConsoleKit GConf M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en at-spi2-atk at-spi2-core atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 db48 dbus-glib dbus-python dconf desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gc gcr gd gdbm gdk-pixbuf2 gegl giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gnome-keyring gnome-themes-standard gnu-efi gobject-introspection grantlee gsettings-desktop-schemas gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtk+3 gtkspell gvfs harfbuzz herqq hicolor-icon-theme hunspell icon-naming-utils icu4c ilmbase imlib iso-codes jasper js185 keybinder keyutils lcms lcms2 lesstif libaio libao libarchive libart_lgpl libatasmart libbluedevil libcaca libcanberra libcap libcddb libcdio libcroco libdbusmenu-qt libdiscid libdvdread libelf libevent libexif libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnl3 libnotify libogg liboggz liboil libpcap libplist libpng libproxy libraw1394 librsvg libsamplerate libsecret libsndfile libsoup libspectre libssh libtasn1 libtermcap libtheora libtiff libunistring libusb libusb-compat libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libyaml libzip loudmouth lzo media-player-info mhash mm mozilla-nss mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-gstreamer phonon-mplayer phonon-xine pil pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pycairo pycups pycurl pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qjson qt qtscriptgenerator raptor2 rasqal readline redland sdl seamonkey-solibs sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack zlib \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/l/maketag.ez b/slackware64/l/maketag.ez
index c325caa5f..4547352ff 100644
--- a/slackware64/l/maketag.ez
+++ b/slackware64/l/maketag.ez
@@ -26,6 +26,8 @@ you are done." 22 74 10 \
 "apr-util" "Extra APR library interfaces" "on" \
 "aspell" "Spell checking library" "on" \
 "aspell-en" "English word list for Aspell" "on" \
+"at-spi2-atk" "AT-SPI2 bridge to ATK" "on" \
+"at-spi2-core" "Assistive Technology Interface core" "on" \
 "atk" "Accessability library" "on" \
 "attica" "Qt Collaboration library" "on" \
 "audiofile" "SGI's Audio File sound library" "on" \
@@ -40,6 +42,7 @@ you are done." 22 74 10 \
 "db48" "Berkeley DB library, version 4.8" "on" \
 "dbus-glib" "glib bindings for the dbus IPC library" "on" \
 "dbus-python" "Python bindings for the D-Bus library" "on" \
+"dconf" "low-level configuration system" "on" \
 "desktop-file-utils" "Tools for .desktop files" "on" \
 "djvulibre" "Web-centric document and image format" "on" \
 "ebook-tools" "Tools for ebook file formats" "on" \
@@ -53,6 +56,7 @@ you are done." 22 74 10 \
 "fribidi" "Unicode BiDirectional library" "on" \
 "fuse" "Tools for using filesystems in userspace" "on" \
 "gamin" "a minimalist FAM replacement" "on" \
+"gc" "Boehm-Demers-Weiser garbage collector library" "on" \
 "gcr" "crypto library and ui for gnome-keyring" "on" \
 "gd" "A graphics library" "on" \
 "gdbm" "The GNU gdbm database library" "on" \
@@ -71,6 +75,8 @@ you are done." 22 74 10 \
 "gmp" "A library for arithmetic" "on" \
 "gnome-icon-theme" "Icons for GTK+ applications" "on" \
 "gnome-keyring" "a tool to handle security credentials" "on" \
+"gnome-themes-standard" "Default icons used by many GTK+ applications" "on" \
+"gnu-efi" "EFI Development files for the GNU toolchain" "on" \
 "gobject-introspection" "GObject interface introspection library" "on" \
 "grantlee" "String Template system based on Qt" "on" \
 "gsettings-desktop-schemas" "GSettings schemas" "on" \
@@ -82,6 +88,7 @@ you are done." 22 74 10 \
 "gtk+3" "GTK+ version 3" "on" \
 "gtkspell" "GTK+ spell checker interface library" "on" \
 "gvfs" "glib virtual filesystems" "on" \
+"harfbuzz" "OpenType text shaping engine" "on" \
 "herqq" "UPnP Device Architecture library" "on" \
 "hicolor-icon-theme" "Standard icon theme tree" "on" \
 "hunspell" "Spell checker and morphological analyzer" "on" \
@@ -113,6 +120,7 @@ you are done." 22 74 10 \
 "libdiscid" "Library to generate DiscIDs from audio CDs" "on" \
 "libdvdread" "Library for reading DVDs" "on" \
 "libelf" "ELF object file access library" "on" \
+"libevent" "event loop library" "on" \
 "libexif" "EXIF (image information) library" "on" \
 "libffi" "Foreign Function Interface library" "on" \
 "libglade" "An interface construction library" "on" \
@@ -151,6 +159,7 @@ you are done." 22 74 10 \
 "libraw1394" "User space IEEE 1394 driver" "on" \
 "librsvg" "Scalable Vector Graphics library" "on" \
 "libsamplerate" "Digital audio resampling library" "on" \
+"libsecret" "library to access the Secret Service API" "on" \
 "libsndfile" "A library for handling digital audio files" "on" \
 "libsoup" "an HTTP client/server library" "on" \
 "libspectre" "Ghostscript wrapper library" "on" \
@@ -159,6 +168,7 @@ you are done." 22 74 10 \
 "libtermcap" "GNU terminal control library" "on" \
 "libtheora" "Theora video codec library" "on" \
 "libtiff" "Tag Image File format library" "on" \
+"libunistring" "GNU Unicode string library" "on" \
 "libusb" "A library for accessing USB devices" "on" \
 "libusb-compat" "Compat library for the old libusb API/ABI" "on" \
 "libvisual" "Audio visualization library" "on" \
@@ -212,6 +222,7 @@ you are done." 22 74 10 \
 "qca-gnupg" "GnuPG plugin for QCA" "on" \
 "qca-ossl" "OpenSSL plugin for QCA" "on" \
 "qimageblitz" "Graphical effect/filter library for KDE4" "on" \
+"qjson" "manage JSON objects with Qt" "on" \
 "qt" "C++ GUI library used by KDE" "on" \
 "qtscriptgenerator" "Qt API Bindings for QtScript" "on" \
 "raptor2" "RDF parser and serializer" "on" \
@@ -248,7 +259,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-ConsoleKit GConf M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 db48 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gcr gd gdbm gdk-pixbuf2 gegl giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gnome-keyring gobject-introspection grantlee gsettings-desktop-schemas gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtk+3 gtkspell gvfs herqq hicolor-icon-theme hunspell icon-naming-utils icu4c ilmbase imlib iso-codes jasper js185 keybinder keyutils lcms lcms2 lesstif libaio libao libarchive libart_lgpl libatasmart libbluedevil libcaca libcanberra libcap libcddb libcdio libcroco libdbusmenu-qt libdiscid libdvdread libelf libexif libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnl3 libnotify libogg liboggz liboil libpcap libplist libpng libproxy libraw1394 librsvg libsamplerate libsndfile libsoup libspectre libssh libtasn1 libtermcap libtheora libtiff libusb libusb-compat libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libyaml libzip loudmouth lzo media-player-info mhash mm mozilla-nss mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-gstreamer phonon-mplayer phonon-xine pil pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pycairo pycups pycurl pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor2 rasqal readline redland sdl seamonkey-solibs sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack zlib \
+ConsoleKit GConf M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en at-spi2-atk at-spi2-core atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 db48 dbus-glib dbus-python dconf desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gc gcr gd gdbm gdk-pixbuf2 gegl giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gnome-keyring gnome-themes-standard gnu-efi gobject-introspection grantlee gsettings-desktop-schemas gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtk+3 gtkspell gvfs harfbuzz herqq hicolor-icon-theme hunspell icon-naming-utils icu4c ilmbase imlib iso-codes jasper js185 keybinder keyutils lcms lcms2 lesstif libaio libao libarchive libart_lgpl libatasmart libbluedevil libcaca libcanberra libcap libcddb libcdio libcroco libdbusmenu-qt libdiscid libdvdread libelf libevent libexif libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnl3 libnotify libogg liboggz liboil libpcap libplist libpng libproxy libraw1394 librsvg libsamplerate libsecret libsndfile libsoup libspectre libssh libtasn1 libtermcap libtheora libtiff libunistring libusb libusb-compat libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libyaml libzip loudmouth lzo media-player-info mhash mm mozilla-nss mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-gstreamer phonon-mplayer phonon-xine pil pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pycairo pycups pycurl pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qjson qt qtscriptgenerator raptor2 rasqal readline redland sdl seamonkey-solibs sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack zlib \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -256,9 +267,9 @@ ConsoleKit GConf M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr ap
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-ConsoleKit GConf M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 db48 dbus-glib dbus-python desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gcr gd gdbm gdk-pixbuf2 gegl giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gnome-keyring gobject-introspection grantlee gsettings-desktop-schemas gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtk+3 gtkspell gvfs herqq hicolor-icon-theme hunspell icon-naming-utils icu4c ilmbase imlib iso-codes jasper js185 keybinder keyutils lcms lcms2 lesstif libaio libao libarchive libart_lgpl libatasmart libbluedevil libcaca libcanberra libcap libcddb libcdio libcroco libdbusmenu-qt libdiscid libdvdread libelf libexif libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnl3 libnotify libogg liboggz liboil libpcap libplist libpng libproxy libraw1394 librsvg libsamplerate libsndfile libsoup libspectre libssh libtasn1 libtermcap libtheora libtiff libusb libusb-compat libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libyaml libzip loudmouth lzo media-player-info mhash mm mozilla-nss mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-gstreamer phonon-mplayer phonon-xine pil pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pycairo pycups pycurl pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qt qtscriptgenerator raptor2 rasqal readline redland sdl seamonkey-solibs sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack zlib \
+ConsoleKit GConf M2Crypto PyQt QScintilla aalib akonadi alsa-lib alsa-oss apr apr-util aspell aspell-en at-spi2-atk at-spi2-core atk attica audiofile automoc4 babl boost cairo chmlib clucene db42 db44 db48 dbus-glib dbus-python dconf desktop-file-utils djvulibre ebook-tools eigen2 enchant esound exiv2 expat fftw freetype fribidi fuse gamin gc gcr gd gdbm gdk-pixbuf2 gegl giflib glade3 glib glib-networking glib2 glibc glibc-i18n glibc-profile gmime gmm gmp gnome-icon-theme gnome-keyring gnome-themes-standard gnu-efi gobject-introspection grantlee gsettings-desktop-schemas gst-plugins-base gst-plugins-good gstreamer gtk+ gtk+2 gtk+3 gtkspell gvfs harfbuzz herqq hicolor-icon-theme hunspell icon-naming-utils icu4c ilmbase imlib iso-codes jasper js185 keybinder keyutils lcms lcms2 lesstif libaio libao libarchive libart_lgpl libatasmart libbluedevil libcaca libcanberra libcap libcddb libcdio libcroco libdbusmenu-qt libdiscid libdvdread libelf libevent libexif libffi libglade libgnome-keyring libgphoto2 libgpod libgsf libical libid3tag libidl libidn libieee1284 libiodbc libjpeg libkarma liblastfm libmad libmcrypt libmcs libmng libmowgli libmpc libmsn libmtp libnjb libnl libnl3 libnotify libogg liboggz liboil libpcap libplist libpng libproxy libraw1394 librsvg libsamplerate libsecret libsndfile libsoup libspectre libssh libtasn1 libtermcap libtheora libtiff libunistring libusb libusb-compat libvisual libvisual-plugins libvncserver libvorbis libwmf libwmf-docs libwnck libwpd libxklavier libxml2 libxslt libyaml libzip loudmouth lzo media-player-info mhash mm mozilla-nss mpfr ncurses neon netpbm notify-python openexr pango parted pcre phonon phonon-gstreamer phonon-mplayer phonon-xine pil pilot-link polkit polkit-gnome polkit-qt-1 poppler poppler-data popt pycairo pycups pycurl pygobject pygtk pyrex qca qca-cyrus-sasl qca-gnupg qca-ossl qimageblitz qjson qt qtscriptgenerator raptor2 rasqal readline redland sdl seamonkey-solibs sg3_utils shared-desktop-ontologies shared-mime-info sip slang slang1 soprano sound-theme-freedesktop startup-notification strigi svgalib system-config-printer t1lib taglib taglib-extras tango-icon-theme tango-icon-theme-extras urwid v4l-utils virtuoso-ose vte wavpack zlib \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/l/tagfile b/slackware64/l/tagfile
index 722c94a2c..7f5001cc7 100644
--- a/slackware64/l/tagfile
+++ b/slackware64/l/tagfile
@@ -11,6 +11,8 @@ apr:REC
 apr-util:REC
 aspell:REC
 aspell-en:REC
+at-spi2-atk:REC
+at-spi2-core:REC
 atk:REC
 attica:ADD
 audiofile:REC
@@ -25,6 +27,7 @@ db44:REC
 db48:REC
 dbus-glib:REC
 dbus-python:REC
+dconf:REC
 desktop-file-utils:REC
 djvulibre:REC
 ebook-tools:ADD
@@ -38,6 +41,7 @@ freetype:REC
 fribidi:REC
 fuse:OPT
 gamin:REC
+gc:REC
 gcr:REC
 gd:REC
 gdbm:REC
@@ -56,6 +60,8 @@ gmm:REC
 gmp:REC
 gnome-icon-theme:REC
 gnome-keyring:REC
+gnome-themes-standard:REC
+gnu-efi:REC
 gobject-introspection:REC
 grantlee:REC
 gsettings-desktop-schemas:REC
@@ -67,6 +73,7 @@ gtk+2:REC
 gtk+3:REC
 gtkspell:REC
 gvfs:REC
+harfbuzz:REC
 herqq:REC
 hicolor-icon-theme:REC
 hunspell:ADD
@@ -98,6 +105,7 @@ libdbusmenu-qt:REC
 libdiscid:ADD
 libdvdread:REC
 libelf:REC
+libevent:REC
 libexif:REC
 libffi:REC
 libglade:REC
@@ -136,6 +144,7 @@ libproxy:REC
 libraw1394:REC
 librsvg:REC
 libsamplerate:REC
+libsecret:REC
 libsndfile:REC
 libsoup:REC
 libspectre:REC
@@ -144,6 +153,7 @@ libtasn1:REC
 libtermcap:REC
 libtheora:REC
 libtiff:REC
+libunistring:OPT
 libusb:REC
 libusb-compat:REC
 libvisual:REC
@@ -197,6 +207,7 @@ qca-cyrus-sasl:REC
 qca-gnupg:REC
 qca-ossl:REC
 qimageblitz:REC
+qjson:REC
 qt:ADD
 qtscriptgenerator:ADD
 raptor2:REC
diff --git a/slackware64/n/maketag b/slackware64/n/maketag
index 3457fe92e..cbcf40221 100644
--- a/slackware64/n/maketag
+++ b/slackware64/n/maketag
@@ -25,6 +25,7 @@ Press ENTER when you are done." \
 "bsd-finger" "BSD finger daemon and client" "on" \
 "ca-certificates" "PEM certificates to verify SSL connections" "on" \
 "cifs-utils" "CIFS filesystem utilities" "on" \
+"conntrack-tools" "Connection Tracking System tools" "on" \
 "crda" "Central Regulatory Domain Agent" "on" \
 "curl" "Command-line URL transfer utility" "on" \
 "cyrus-sasl" "SASL email authentication library" "on" \
@@ -32,6 +33,7 @@ Press ENTER when you are done." \
 "dhcpcd" "DHCP client daemon" "on" \
 "dirmngr" "Certificate Revocation Lists Manager for GPG" "on" \
 "dnsmasq" "Small DNS/DHCP server for a LAN" "on" \
+"ebtables" "Bridge filtering utility" "on" \
 "elm" "Menu-driven user mail program" "on" \
 "epic5" "EPIC Internet Relay Chat (IRC) client" "on" \
 "ethtool" "A tool for configuring Ethernet devices" "on" \
@@ -50,6 +52,7 @@ Press ENTER when you are done." \
 "imapd" "ipop3d/imapd remote mail access daemons" "on" \
 "inetd" "Internet super server daemon" "on" \
 "iproute2" "Kernel routing and traffic control" "on" \
+"ipset" "Kernel IP sets admin tool" "on" \
 "iptables" "Firewall configuration utility" "on" \
 "iptraf-ng" "Network monitoring program" "on" \
 "iputils" "Some common network tools" "on" \
@@ -62,6 +65,16 @@ Press ENTER when you are done." \
 "libgcrypt" "General purpose crypto library" "on" \
 "libgpg-error" "GnuPG Error Definitions Library" "on" \
 "libksba" "X.509 & CMS library for S/MIME and TLS" "on" \
+"libmbim" "Mobile Broadband Interface Model library" "on" \
+"libmnl" "Netlink user-space library" "on" \
+"libnetfilter_acct" "Netfilter accounting library" "on" \
+"libnetfilter_conntrack" "Netfilter conntrack library" "on" \
+"libnetfilter_cthelper" "Netfilter conntrack helpers library" "on" \
+"libnetfilter_cttimeout" "Netfilter connection tracking timeout library" "on" \
+"libnetfilter_log" "Netfilter packet logging library" "on" \
+"libnetfilter_queue" "Netfilter packet queueing library" "on" \
+"libnfnetlink" "Netfilter kernel/userspace comm library" "on" \
+"libqmi" "QMI library and utils" "on" \
 "links" "Text-based WWW browser (with frames)" "on" \
 "lynx" "Classic text-based WWW browser" "on" \
 "mailx" "A simple user mail program" "on" \
@@ -91,6 +104,7 @@ Press ENTER when you are done." \
 "network-scripts" "Scripts required for networking on Slackware" "on" \
 "netwrite" "Write to users on a remote machine" "on" \
 "newspost" "Posts multipart binaries on USENET" "on" \
+"nfacct" "Tool to manage accounting objects" "on" \
 "nfs-utils" "Network File System daemons" "on" \
 "nmap" "Network scanning utility" "on" \
 "nn" "The NN news reader" "on" \
@@ -131,6 +145,7 @@ Press ENTER when you are done." \
 "tin" "The 'tin' news reader" "on" \
 "traceroute" "Packet tracing utility" "on" \
 "trn" "A threaded news reader" "on" \
+"ulogd" "Logging daemon for netfilter/iptables" "on" \
 "uucp" "Taylor UUCP with HDB && Taylor configs" "on" \
 "vlan" "Virtual LAN configuration tool" "on" \
 "vsftpd" "The Very Secure FTP (file transfer) daemon" "on" \
@@ -146,7 +161,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba libmbim libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libqmi links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn ulogd uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -154,9 +169,9 @@ ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba libmbim libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libqmi links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn ulogd uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/n/maketag.ez b/slackware64/n/maketag.ez
index 3457fe92e..cbcf40221 100644
--- a/slackware64/n/maketag.ez
+++ b/slackware64/n/maketag.ez
@@ -25,6 +25,7 @@ Press ENTER when you are done." \
 "bsd-finger" "BSD finger daemon and client" "on" \
 "ca-certificates" "PEM certificates to verify SSL connections" "on" \
 "cifs-utils" "CIFS filesystem utilities" "on" \
+"conntrack-tools" "Connection Tracking System tools" "on" \
 "crda" "Central Regulatory Domain Agent" "on" \
 "curl" "Command-line URL transfer utility" "on" \
 "cyrus-sasl" "SASL email authentication library" "on" \
@@ -32,6 +33,7 @@ Press ENTER when you are done." \
 "dhcpcd" "DHCP client daemon" "on" \
 "dirmngr" "Certificate Revocation Lists Manager for GPG" "on" \
 "dnsmasq" "Small DNS/DHCP server for a LAN" "on" \
+"ebtables" "Bridge filtering utility" "on" \
 "elm" "Menu-driven user mail program" "on" \
 "epic5" "EPIC Internet Relay Chat (IRC) client" "on" \
 "ethtool" "A tool for configuring Ethernet devices" "on" \
@@ -50,6 +52,7 @@ Press ENTER when you are done." \
 "imapd" "ipop3d/imapd remote mail access daemons" "on" \
 "inetd" "Internet super server daemon" "on" \
 "iproute2" "Kernel routing and traffic control" "on" \
+"ipset" "Kernel IP sets admin tool" "on" \
 "iptables" "Firewall configuration utility" "on" \
 "iptraf-ng" "Network monitoring program" "on" \
 "iputils" "Some common network tools" "on" \
@@ -62,6 +65,16 @@ Press ENTER when you are done." \
 "libgcrypt" "General purpose crypto library" "on" \
 "libgpg-error" "GnuPG Error Definitions Library" "on" \
 "libksba" "X.509 & CMS library for S/MIME and TLS" "on" \
+"libmbim" "Mobile Broadband Interface Model library" "on" \
+"libmnl" "Netlink user-space library" "on" \
+"libnetfilter_acct" "Netfilter accounting library" "on" \
+"libnetfilter_conntrack" "Netfilter conntrack library" "on" \
+"libnetfilter_cthelper" "Netfilter conntrack helpers library" "on" \
+"libnetfilter_cttimeout" "Netfilter connection tracking timeout library" "on" \
+"libnetfilter_log" "Netfilter packet logging library" "on" \
+"libnetfilter_queue" "Netfilter packet queueing library" "on" \
+"libnfnetlink" "Netfilter kernel/userspace comm library" "on" \
+"libqmi" "QMI library and utils" "on" \
 "links" "Text-based WWW browser (with frames)" "on" \
 "lynx" "Classic text-based WWW browser" "on" \
 "mailx" "A simple user mail program" "on" \
@@ -91,6 +104,7 @@ Press ENTER when you are done." \
 "network-scripts" "Scripts required for networking on Slackware" "on" \
 "netwrite" "Write to users on a remote machine" "on" \
 "newspost" "Posts multipart binaries on USENET" "on" \
+"nfacct" "Tool to manage accounting objects" "on" \
 "nfs-utils" "Network File System daemons" "on" \
 "nmap" "Network scanning utility" "on" \
 "nn" "The NN news reader" "on" \
@@ -131,6 +145,7 @@ Press ENTER when you are done." \
 "tin" "The 'tin' news reader" "on" \
 "traceroute" "Packet tracing utility" "on" \
 "trn" "A threaded news reader" "on" \
+"ulogd" "Logging daemon for netfilter/iptables" "on" \
 "uucp" "Taylor UUCP with HDB && Taylor configs" "on" \
 "vlan" "Virtual LAN configuration tool" "on" \
 "vsftpd" "The Very Secure FTP (file transfer) daemon" "on" \
@@ -146,7 +161,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba libmbim libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libqmi links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn ulogd uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -154,9 +169,9 @@ ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba libmbim libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libqmi links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn ulogd uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/n/tagfile b/slackware64/n/tagfile
index 945ecbe61..c97d97e9a 100644
--- a/slackware64/n/tagfile
+++ b/slackware64/n/tagfile
@@ -12,6 +12,7 @@ bridge-utils:OPT
 bsd-finger:OPT
 ca-certificates:REC
 cifs-utils:OPT
+conntrack-tools:REC
 crda:REC
 curl:OPT
 cyrus-sasl:REC
@@ -19,6 +20,7 @@ dhcp:OPT
 dhcpcd:REC
 dirmngr:REC
 dnsmasq:OPT
+ebtables:REC
 elm:OPT
 epic5:OPT
 ethtool:OPT
@@ -37,6 +39,7 @@ iftop:REC
 imapd:OPT
 inetd:REC
 iproute2:OPT
+ipset:REC
 iptables:ADD
 iptraf-ng:OPT
 iputils:ADD
@@ -49,6 +52,16 @@ libassuan:REC
 libgcrypt:REC
 libgpg-error:REC
 libksba:REC
+libmbim:REC
+libmnl:REC
+libnetfilter_acct:REC
+libnetfilter_conntrack:REC
+libnetfilter_cthelper:REC
+libnetfilter_cttimeout:REC
+libnetfilter_log:REC
+libnetfilter_queue:REC
+libnfnetlink:REC
+libqmi:REC
 links:OPT
 lynx:OPT
 mailx:REC
@@ -78,6 +91,7 @@ netwatch:OPT
 network-scripts:ADD
 netwrite:OPT
 newspost:OPT
+nfacct:REC
 nfs-utils:OPT
 nmap:OPT
 nn:OPT
@@ -118,6 +132,7 @@ tftp-hpa:OPT
 tin:OPT
 traceroute:OPT
 trn:OPT
+ulogd:REC
 uucp:OPT
 vlan:OPT
 vsftpd:REC
diff --git a/slackware64/t/maketag b/slackware64/t/maketag
index 508d959d9..3b077d348 100644
--- a/slackware64/t/maketag
+++ b/slackware64/t/maketag
@@ -31,7 +31,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 tetex tetex-doc transfig xfig \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/t/maketag.ez b/slackware64/t/maketag.ez
index 508d959d9..3b077d348 100644
--- a/slackware64/t/maketag.ez
+++ b/slackware64/t/maketag.ez
@@ -31,7 +31,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 tetex tetex-doc transfig xfig \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/tcl/maketag b/slackware64/tcl/maketag
index f18d9e7cc..9c4c42c04 100644
--- a/slackware64/tcl/maketag
+++ b/slackware64/tcl/maketag
@@ -34,7 +34,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 expect hfsutils tcl tclx tix tk \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/tcl/maketag.ez b/slackware64/tcl/maketag.ez
index f18d9e7cc..9c4c42c04 100644
--- a/slackware64/tcl/maketag.ez
+++ b/slackware64/tcl/maketag.ez
@@ -34,7 +34,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 expect hfsutils tcl tclx tix tk \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/x/maketag b/slackware64/x/maketag
index f91f042c9..1db3f86f6 100644
--- a/slackware64/x/maketag
+++ b/slackware64/x/maketag
@@ -74,6 +74,7 @@ Press ENTER when you are done." \
 "gccmakedep" "create dependencies in makefiles with gcc -M" "on" \
 "glew" "OpenGL Extension Wrangler Library" "on" \
 "glproto" "Prototype files (.h, .pc) for X" "on" \
+"glu" "Mesa OpenGL utility library" "on" \
 "iceauth" "ICE authority file utility" "on" \
 "ico" "animate an icosahedron or other polyhedron" "on" \
 "imake" "C preprocessor interface to the make utility" "on" \
@@ -145,7 +146,6 @@ Press ENTER when you are done." \
 "sazanami-fonts-ttf" "Japanese TrueType Unicode fonts" "on" \
 "scim" "Smart Common Input Method platform" "on" \
 "scim-anthy" "a SCIM IMEngine module for anthy" "on" \
-"scim-bridge" "another gtk-immodule for SCIM" "on" \
 "scim-hangul" "SCIM IMengine for Hangul" "on" \
 "scim-input-pad" "On-screen input pad for SCIM" "on" \
 "scim-m17n" "SCIM bridge support for m17n input" "on" \
@@ -174,12 +174,14 @@ Press ENTER when you are done." \
 "xcalc" "A calculator program for X" "on" \
 "xcb-proto" "Prototype files (.h, .pc) for X" "on" \
 "xcb-util" "Utilities for XCB" "on" \
+"xcb-util-cursor" "XCB cursor library " "on" \
 "xcb-util-image" "XCB library providing XImage and XShmImage" "on" \
 "xcb-util-keysyms" "XCB keysyms library " "on" \
 "xcb-util-renderutil" "XCB renderutil library" "on" \
 "xcb-util-wm" "XCB libraries for EWMH and ICCCM" "on" \
 "xclipboard" "X clipboard client" "on" \
 "xclock" "A desktop clock program for X" "on" \
+"xcm" "X color management tools" "on" \
 "xcmiscproto" "Prototype files (.h, .pc) for X" "on" \
 "xcmsdb" "Device Color Characterization utility for X" "on" \
 "xcompmgr" "X Compositing Manager" "on" \
@@ -233,13 +235,17 @@ Press ENTER when you are done." \
 "xf86-video-savage" "savage video driver for X" "on" \
 "xf86-video-siliconmotion" "siliconmotion video driver for X" "on" \
 "xf86-video-sis" "sis video driver for X" "on" \
+"xf86-video-sisusb" "sisusb video driver for X" "on" \
 "xf86-video-tdfx" "tdfx video driver for X" "on" \
 "xf86-video-tga" "tga video driver for X" "on" \
 "xf86-video-trident" "trident video driver for X" "on" \
+"xf86-video-tseng" "tseng video driver for X" "on" \
 "xf86-video-v4l" "v4l video driver for X" "on" \
 "xf86-video-vesa" "vesa video driver for X" "on" \
 "xf86-video-vmware" "vmware video driver for X" "on" \
 "xf86-video-voodoo" "voodoo video driver for X" "on" \
+"xf86-video-xgi" "xgi video driver for X" "on" \
+"xf86-video-xgixp" "xgixp video driver for X" "on" \
 "xf86bigfontproto" "Prototype files (.h, .pc) for X" "on" \
 "xf86dga" "test program for the XFree86-DGA extension" "on" \
 "xf86dgaproto" "Prototype files (.h, .pc) for X" "on" \
@@ -304,7 +310,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt freeglut fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXaw3d libXcm libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale mtdev oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf transset ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
+anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt freeglut fslsfonts fstobdf gccmakedep glew glproto glu iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXaw3d libXcm libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale mtdev oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf transset ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xclipboard xclock xcm xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86-video-xgixp xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -312,9 +318,9 @@ anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto dama
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt freeglut fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXaw3d libXcm libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale mtdev oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf transset ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
+anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt freeglut fslsfonts fstobdf gccmakedep glew glproto glu iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXaw3d libXcm libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale mtdev oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf transset ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xclipboard xclock xcm xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86-video-xgixp xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/x/maketag.ez b/slackware64/x/maketag.ez
index f91f042c9..1db3f86f6 100644
--- a/slackware64/x/maketag.ez
+++ b/slackware64/x/maketag.ez
@@ -74,6 +74,7 @@ Press ENTER when you are done." \
 "gccmakedep" "create dependencies in makefiles with gcc -M" "on" \
 "glew" "OpenGL Extension Wrangler Library" "on" \
 "glproto" "Prototype files (.h, .pc) for X" "on" \
+"glu" "Mesa OpenGL utility library" "on" \
 "iceauth" "ICE authority file utility" "on" \
 "ico" "animate an icosahedron or other polyhedron" "on" \
 "imake" "C preprocessor interface to the make utility" "on" \
@@ -145,7 +146,6 @@ Press ENTER when you are done." \
 "sazanami-fonts-ttf" "Japanese TrueType Unicode fonts" "on" \
 "scim" "Smart Common Input Method platform" "on" \
 "scim-anthy" "a SCIM IMEngine module for anthy" "on" \
-"scim-bridge" "another gtk-immodule for SCIM" "on" \
 "scim-hangul" "SCIM IMengine for Hangul" "on" \
 "scim-input-pad" "On-screen input pad for SCIM" "on" \
 "scim-m17n" "SCIM bridge support for m17n input" "on" \
@@ -174,12 +174,14 @@ Press ENTER when you are done." \
 "xcalc" "A calculator program for X" "on" \
 "xcb-proto" "Prototype files (.h, .pc) for X" "on" \
 "xcb-util" "Utilities for XCB" "on" \
+"xcb-util-cursor" "XCB cursor library " "on" \
 "xcb-util-image" "XCB library providing XImage and XShmImage" "on" \
 "xcb-util-keysyms" "XCB keysyms library " "on" \
 "xcb-util-renderutil" "XCB renderutil library" "on" \
 "xcb-util-wm" "XCB libraries for EWMH and ICCCM" "on" \
 "xclipboard" "X clipboard client" "on" \
 "xclock" "A desktop clock program for X" "on" \
+"xcm" "X color management tools" "on" \
 "xcmiscproto" "Prototype files (.h, .pc) for X" "on" \
 "xcmsdb" "Device Color Characterization utility for X" "on" \
 "xcompmgr" "X Compositing Manager" "on" \
@@ -233,13 +235,17 @@ Press ENTER when you are done." \
 "xf86-video-savage" "savage video driver for X" "on" \
 "xf86-video-siliconmotion" "siliconmotion video driver for X" "on" \
 "xf86-video-sis" "sis video driver for X" "on" \
+"xf86-video-sisusb" "sisusb video driver for X" "on" \
 "xf86-video-tdfx" "tdfx video driver for X" "on" \
 "xf86-video-tga" "tga video driver for X" "on" \
 "xf86-video-trident" "trident video driver for X" "on" \
+"xf86-video-tseng" "tseng video driver for X" "on" \
 "xf86-video-v4l" "v4l video driver for X" "on" \
 "xf86-video-vesa" "vesa video driver for X" "on" \
 "xf86-video-vmware" "vmware video driver for X" "on" \
 "xf86-video-voodoo" "voodoo video driver for X" "on" \
+"xf86-video-xgi" "xgi video driver for X" "on" \
+"xf86-video-xgixp" "xgixp video driver for X" "on" \
 "xf86bigfontproto" "Prototype files (.h, .pc) for X" "on" \
 "xf86dga" "test program for the XFree86-DGA extension" "on" \
 "xf86dgaproto" "Prototype files (.h, .pc) for X" "on" \
@@ -304,7 +310,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt freeglut fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXaw3d libXcm libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale mtdev oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf transset ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
+anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt freeglut fslsfonts fstobdf gccmakedep glew glproto glu iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXaw3d libXcm libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale mtdev oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf transset ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xclipboard xclock xcm xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86-video-xgixp xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -312,9 +318,9 @@ anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto dama
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt freeglut fslsfonts fstobdf gccmakedep glew glproto iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXaw3d libXcm libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale mtdev oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-bridge scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf transset ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xclipboard xclock xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
+anthy appres bdftopcf beforelight bigreqsproto bitmap compiz compositeproto damageproto dejavu-fonts-ttf dmxproto dri2proto editres encodings evieext fixesproto font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi font-adobe-utopia-75dpi font-adobe-utopia-type1 font-alias font-arabic-misc font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 font-bitstream-100dpi font-bitstream-75dpi font-bitstream-speedo font-bitstream-type1 font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic font-misc-ethiopic font-misc-meltho font-misc-misc font-mutt-misc font-schumacher-misc font-screen-cyrillic font-sony-misc font-sun-misc font-util font-winitzki-cyrillic font-xfree86-type1 fontcacheproto fontconfig fontsproto fonttosfnt freeglut fslsfonts fstobdf gccmakedep glew glproto glu iceauth ico imake inputproto intel-gpu-tools kbproto libFS libICE libSM libX11 libXScrnSaver libXau libXaw libXaw3d libXcm libXcomposite libXcursor libXdamage libXdmcp libXevie libXext libXfixes libXfont libXfontcache libXft libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm libdmx libdrm liberation-fonts-ttf libfontenc libhangul libpciaccess libpthread-stubs libxcb libxkbfile listres lndir luit m17n-lib makedepend mesa mkcomposecache mkfontdir mkfontscale mtdev oclock pixman printproto randrproto recordproto rendercheck renderproto resourceproto rgb sazanami-fonts-ttf scim scim-anthy scim-hangul scim-input-pad scim-m17n scim-pinyin scim-tables scrnsaverproto sessreg setxkbmap showfont sinhala_lklug-font-ttf smproxy tibmachuni-font-ttf transset ttf-indic-fonts twm util-macros videoproto viewres wqy-zenhei-font-ttf x11-skel x11perf xauth xbacklight xbiff xbitmaps xcalc xcb-proto xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xclipboard xclock xcm xcmiscproto xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xdg-user-dirs xdg-utils xditview xdm xdpyinfo xdriinfo xedit xev xextproto xeyes xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick xf86-input-keyboard xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse xf86-input-void xf86-input-wacom xf86-video-apm xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint xf86-video-i128 xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau xf86-video-nv xf86-video-openchrome xf86-video-r128 xf86-video-rendition xf86-video-s3 xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-sisusb xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-tseng xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi xf86-video-xgixp xf86bigfontproto xf86dga xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto xfd xfontsel xfs xfsinfo xgamma xgc xhost xineramaproto xinit xinput xkbcomp xkbevd xkbprint xkbutils xkeyboard-config xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xorg-cf-files xorg-docs xorg-server xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-sgml-doctools xpr xprop xproto xpyb xrandr xrdb xrefresh xscope xset xsetroot xsm xstdcmap xterm xtrans xvidtune xvinfo xwd xwininfo xwud \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/x/tagfile b/slackware64/x/tagfile
index dc3c1e85b..891a6ca7e 100644
--- a/slackware64/x/tagfile
+++ b/slackware64/x/tagfile
@@ -61,6 +61,7 @@ fstobdf:REC
 gccmakedep:REC
 glew:ADD
 glproto:REC
+glu:ADD
 iceauth:REC
 ico:REC
 imake:REC
@@ -132,7 +133,6 @@ rgb:REC
 sazanami-fonts-ttf:REC
 scim:REC
 scim-anthy:REC
-scim-bridge:REC
 scim-hangul:REC
 scim-input-pad:REC
 scim-m17n:REC
@@ -161,12 +161,14 @@ xbitmaps:REC
 xcalc:REC
 xcb-proto:REC
 xcb-util:ADD
+xcb-util-cursor:REC
 xcb-util-image:REC
 xcb-util-keysyms:REC
 xcb-util-renderutil:REC
 xcb-util-wm:REC
 xclipboard:REC
 xclock:REC
+xcm:REC
 xcmiscproto:REC
 xcmsdb:REC
 xcompmgr:REC
@@ -220,13 +222,17 @@ xf86-video-s3virge:REC
 xf86-video-savage:REC
 xf86-video-siliconmotion:REC
 xf86-video-sis:REC
+xf86-video-sisusb:REC
 xf86-video-tdfx:REC
 xf86-video-tga:REC
 xf86-video-trident:REC
+xf86-video-tseng:REC
 xf86-video-v4l:REC
 xf86-video-vesa:REC
 xf86-video-vmware:REC
 xf86-video-voodoo:REC
+xf86-video-xgi:REC
+xf86-video-xgixp:REC
 xf86bigfontproto:REC
 xf86dga:REC
 xf86dgaproto:REC
diff --git a/slackware64/xap/maketag b/slackware64/xap/maketag
index d04e5dab6..1c407d4ef 100644
--- a/slackware64/xap/maketag
+++ b/slackware64/xap/maketag
@@ -16,6 +16,7 @@ Press ENTER when you are done." \
 "audacious-plugins" "Plugins for Audacious to support media types" "on" \
 "blackbox" "Minimalist and fast window manager" "on" \
 "blueman" "Graphical Bluetooth manager" "on" \
+"ddd" "X frontend for the GNU gdb debugger" "on" \
 "electricsheep" "A distributed screensaver program" "on" \
 "fluxbox" "Window manager based on blackbox" "on" \
 "fvwm" "FVWM window manager" "on" \
@@ -55,13 +56,12 @@ Press ENTER when you are done." \
 "xsane" "X interface to Scanner Access Now Easy" "on" \
 "xscreensaver" "A screen saver and locker for X" "on" \
 "xv" "XV GIF/TIFF/JPEG/PostScript Image Viewer" "on" \
-"xxgdb" "X frontend for the GNU gdb debugger" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird network-manager-applet pan pidgin rdesktop rxvt sane seamonkey seyon vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
+MPlayer audacious audacious-plugins blackbox blueman ddd electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird network-manager-applet pan pidgin rdesktop rxvt sane seamonkey seyon vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -69,9 +69,9 @@ MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird network-manager-applet pan pidgin rdesktop rxvt sane seamonkey seyon vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
+MPlayer audacious audacious-plugins blackbox blueman ddd electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird network-manager-applet pan pidgin rdesktop rxvt sane seamonkey seyon vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/xap/maketag.ez b/slackware64/xap/maketag.ez
index d04e5dab6..1c407d4ef 100644
--- a/slackware64/xap/maketag.ez
+++ b/slackware64/xap/maketag.ez
@@ -16,6 +16,7 @@ Press ENTER when you are done." \
 "audacious-plugins" "Plugins for Audacious to support media types" "on" \
 "blackbox" "Minimalist and fast window manager" "on" \
 "blueman" "Graphical Bluetooth manager" "on" \
+"ddd" "X frontend for the GNU gdb debugger" "on" \
 "electricsheep" "A distributed screensaver program" "on" \
 "fluxbox" "Window manager based on blackbox" "on" \
 "fvwm" "FVWM window manager" "on" \
@@ -55,13 +56,12 @@ Press ENTER when you are done." \
 "xsane" "X interface to Scanner Access Now Easy" "on" \
 "xscreensaver" "A screen saver and locker for X" "on" \
 "xv" "XV GIF/TIFF/JPEG/PostScript Image Viewer" "on" \
-"xxgdb" "X frontend for the GNU gdb debugger" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird network-manager-applet pan pidgin rdesktop rxvt sane seamonkey seyon vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
+MPlayer audacious audacious-plugins blackbox blueman ddd electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird network-manager-applet pan pidgin rdesktop rxvt sane seamonkey seyon vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -69,9 +69,9 @@ MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-MPlayer audacious audacious-plugins blackbox blueman electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird network-manager-applet pan pidgin rdesktop rxvt sane seamonkey seyon vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv xxgdb \
+MPlayer audacious audacious-plugins blackbox blueman ddd electricsheep fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gucharmap gv imagemagick mozilla-firefox mozilla-thunderbird network-manager-applet pan pidgin rdesktop rxvt sane seamonkey seyon vim-gvim windowmaker x11-ssh-askpass x3270 xaos xchat xfractint xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xv \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/xap/tagfile b/slackware64/xap/tagfile
index e8365120e..b61109766 100644
--- a/slackware64/xap/tagfile
+++ b/slackware64/xap/tagfile
@@ -3,6 +3,7 @@ audacious:REC
 audacious-plugins:REC
 blackbox:OPT
 blueman:ADD
+ddd:REC
 electricsheep:REC
 fluxbox:OPT
 fvwm:REC
@@ -42,4 +43,3 @@ xpdf:OPT
 xsane:OPT
 xscreensaver:REC
 xv:REC
-xxgdb:REC
diff --git a/slackware64/xfce/maketag b/slackware64/xfce/maketag
index 130c40d88..e284e1e70 100644
--- a/slackware64/xfce/maketag
+++ b/slackware64/xfce/maketag
@@ -11,7 +11,6 @@ from series XFCE.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are done." \
 20 70 10 \
-"Terminal" "Xfce's Terminal Emulator" "on" \
 "Thunar" "Xfce file manager" "on" \
 "exo" "libexo extension library" "on" \
 "garcon" "menu implementation for Xfce" "on" \
@@ -34,6 +33,7 @@ Press ENTER when you are done." \
 "xfce4-settings" "Xfce settings manager" "on" \
 "xfce4-systemload-plugin" "systemload plugin for the Xfce panel" "on" \
 "xfce4-taskmanager" "running apps / task manager application" "on" \
+"xfce4-terminal" "Xfce's Terminal Emulator" "on" \
 "xfce4-volumed" "audio volume management daemon" "on" \
 "xfce4-weather-plugin" "weather plugin for the Xfce panel" "on" \
 "xfconf" "Xfce configuration storage system" "on" \
@@ -45,7 +45,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-Terminal Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
+Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -53,9 +53,9 @@ Terminal Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 o
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-Terminal Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
+Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/xfce/maketag.ez b/slackware64/xfce/maketag.ez
index 130c40d88..e284e1e70 100644
--- a/slackware64/xfce/maketag.ez
+++ b/slackware64/xfce/maketag.ez
@@ -11,7 +11,6 @@ from series XFCE.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are done." \
 20 70 10 \
-"Terminal" "Xfce's Terminal Emulator" "on" \
 "Thunar" "Xfce file manager" "on" \
 "exo" "libexo extension library" "on" \
 "garcon" "menu implementation for Xfce" "on" \
@@ -34,6 +33,7 @@ Press ENTER when you are done." \
 "xfce4-settings" "Xfce settings manager" "on" \
 "xfce4-systemload-plugin" "systemload plugin for the Xfce panel" "on" \
 "xfce4-taskmanager" "running apps / task manager application" "on" \
+"xfce4-terminal" "Xfce's Terminal Emulator" "on" \
 "xfce4-volumed" "audio volume management daemon" "on" \
 "xfce4-weather-plugin" "weather plugin for the Xfce panel" "on" \
 "xfconf" "Xfce configuration storage system" "on" \
@@ -45,7 +45,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-Terminal Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
+Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -53,9 +53,9 @@ Terminal Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 o
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-Terminal Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
+Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/xfce/tagfile b/slackware64/xfce/tagfile
index 34cbce212..bf3b5efdc 100644
--- a/slackware64/xfce/tagfile
+++ b/slackware64/xfce/tagfile
@@ -1,4 +1,3 @@
-Terminal:REC
 Thunar:REC
 exo:REC
 garcon:REC
@@ -21,6 +20,7 @@ xfce4-session:REC
 xfce4-settings:REC
 xfce4-systemload-plugin:REC
 xfce4-taskmanager:REC
+xfce4-terminal:REC
 xfce4-volumed:REC
 xfce4-weather-plugin:REC
 xfconf:REC
diff --git a/slackware64/y/maketag b/slackware64/y/maketag
index b35b445da..2d57221e4 100644
--- a/slackware64/y/maketag
+++ b/slackware64/y/maketag
@@ -37,7 +37,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 bsd-games \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/y/maketag.ez b/slackware64/y/maketag.ez
index b35b445da..2d57221e4 100644
--- a/slackware64/y/maketag.ez
+++ b/slackware64/y/maketag.ez
@@ -37,7 +37,7 @@ cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
 bsd-games \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag