diff --git a/office/texworks/README b/office/texworks/README
index 972b463b7f..91f907df3f 100644
--- a/office/texworks/README
+++ b/office/texworks/README
@@ -1,3 +1,9 @@
-TeXworks is an environment for authoring TeX (LaTeX, ConTeXt, etc) documents, 
-with a Unicode-based, TeX-aware editor, integrated PDF viewer, and a clean, 
-simple interface accessible to casual and non-technical users.
+TeXworks is an environment for authoring TeX (LaTeX, ConTeXt, etc)
+documents, with a Unicode-based, TeX-aware editor, integrated PDF
+viewer, and a clean, simple interface accessible to casual and
+non-technical users. The integrated PDF viewer supports synctex, e.g.
+control-clicking within the source text to locate the corresponding
+position in the PDF, and vice versa.
+
+Optionally, hunspell dictionaries provide spellchecking support.
+Install hunspell-de, hunspell-en, hunspell-es or hunspell-pl.
diff --git a/office/texworks/slack-desc b/office/texworks/slack-desc
index 6d534aee42..3d9cc0bf43 100644
--- a/office/texworks/slack-desc
+++ b/office/texworks/slack-desc
@@ -6,13 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-texworks: texworks (TeX editor)
+texworks: texworks (A TeX IDE)
 texworks:
-texworks: TeXworks is a simple environment for editing, typesetting,
-texworks: and previewing TeX documents.
-texworks:
-texworks: Homepage: http://code.google.com/p/texworks/
+texworks: TeXworks is an effort to build a simple TeX front-end.  The
+texworks: integrated PDF viewer supports control-clicking within the source
+texworks: text to locate the corresponding position in the PDF, and vice versa.
 texworks:
+texworks: Homepage: http://tug.org/texworks/
 texworks:
 texworks:
 texworks:
diff --git a/office/texworks/texworks.SlackBuild b/office/texworks/texworks.SlackBuild
index 5acc768e61..e2f4a104a3 100644
--- a/office/texworks/texworks.SlackBuild
+++ b/office/texworks/texworks.SlackBuild
@@ -4,16 +4,34 @@
 
 # Written by digwtx (wtx358@qq.com)
 # Updated by Willy Sudiarto Raharjo
+# Copyright 2016  Johannes Schoepfer
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=texworks
-GVERSION=${GVERSION:-0.4.4-r1004}
-VERSION=${VERSION:-0.4.4}
+VERSION=${VERSION:-0.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -24,11 +42,11 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686 -pipe"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -pipe"
+  SLKCFLAGS="-O2 -march=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
@@ -43,40 +61,49 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$GVERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-release-$VERSION
+tar xvf $CWD/$PRGNAM-release-$VERSION.tar.gz
+cd $PRGNAM-release-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-qmake -unix PREFIX=/usr \
-  QMAKE_CFLAGS_RELEASE="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS_RELEASE="$SLKCFLAGS"
+( mkdir build
+  cd build
+        #-DWITH_LUA='ON' \
+  cmake \
+        -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+        -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DTeXworks_PLUGIN_DIR="/usr/lib$LIBDIRSUFFIX/texworks" \
+        -DTW_BUILD_ID='slackbuilds.org' \
+        -DWITH_PYTHON='ON' \
+        -DDESIRED_QT_VERSION:STRING=4 \
+        -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+)
 
-make || exit 1
+#-DMAN_INSTALL_DIR=/usr/man doesn't work here
+mkdir -p $PKG/usr/man/man1
+cat $PKG/usr/share/man/man1/texworks.1 | gzip > $PKG/usr/man/man1/texworks.1.gz
+rm -rf $PKG/usr/share/man
 
-mkdir -pv $PKG/usr/bin
-mkdir -pv $PKG/usr/share/pixmaps
-mkdir -pv $PKG/usr/share/applications
+( mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+  cd $PKG/usr/share/doc/texworks
+  mv COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
+)
+rm -rf $PKG/usr/share/doc
 
-cp texworks $PKG/usr/bin/
-cp res/images/TeXworks.png $PKG/usr/share/pixmaps
-cp $CWD/texworks.desktop $PKG/usr/share/applications
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -pv $PKG/install
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
diff --git a/office/texworks/texworks.desktop b/office/texworks/texworks.desktop
deleted file mode 100644
index c89af2b5e0..0000000000
--- a/office/texworks/texworks.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=TeXWorks
-Comment=Run TeXWorks
-Icon=TeXworks
-Exec=texworks
-Terminal=false
diff --git a/office/texworks/texworks.info b/office/texworks/texworks.info
index 41e1fa9b07..daaa172cb7 100644
--- a/office/texworks/texworks.info
+++ b/office/texworks/texworks.info
@@ -1,10 +1,10 @@
 PRGNAM="texworks"
-VERSION="0.4.4"
-HOMEPAGE="http://code.google.com/p/texworks/"
-DOWNLOAD="https://texworks.googlecode.com/files/texworks-0.4.4-r1004.tar.gz"
-MD5SUM="e5e70cd9671f7f8d6ff7978ebcbaa9b4"
+VERSION="0.6.1"
+HOMEPAGE="http://tug.org/texworks/"
+DOWNLOAD="https://github.com/TeXworks/texworks/archive/release-0.6.1/texworks-release-0.6.1.tar.gz"
+MD5SUM="3c482faec65442b24e941739e7caa7f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="digwtx"
-EMAIL="wtx358@qq.com"
+REQUIRES="texlive"
+MAINTAINER="Johannes Schoepfer"
+EMAIL="slackbuilds[at]schoepfer[dot]info"