diff --git a/multimedia/winff/README b/multimedia/winff/README
index ce986ff61e..0c76f8ddaf 100644
--- a/multimedia/winff/README
+++ b/multimedia/winff/README
@@ -2,3 +2,8 @@ WinFF is a GUI for the command line video converter, FFMPEG. It will
 convert most any video file that FFmpeg will convert. WinFF does
 multiple files in multiple formats at one time. You can for example
 convert mpeg's, flv's, and mov's, all into avi's all at once.
+
+lazarus is just a build-time dependency.
+
+NOTE: if you have a previous ~/.winff directory you might want to
+remove it or your presets might not be updated.
diff --git a/multimedia/winff/presets.xml.gz b/multimedia/winff/presets.xml.gz
new file mode 100644
index 0000000000..29c49e5bda
Binary files /dev/null and b/multimedia/winff/presets.xml.gz differ
diff --git a/multimedia/winff/winff.SlackBuild b/multimedia/winff/winff.SlackBuild
index 7809eea9a6..fbd6015c8c 100644
--- a/multimedia/winff/winff.SlackBuild
+++ b/multimedia/winff/winff.SlackBuild
@@ -22,28 +22,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by the SlackBuilds.org project
+
 PRGNAM=winff
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-20170714_220b212}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i386 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-# Tt is just a binary repackaging.
-if [ "$ARCH" = "i486" ]; then
-  TARGET="i386"
-elif [ "$ARCH" = "i686" ]; then
-  TARGET="i386"
-elif [ "$ARCH" = "x86_64" ]; then
-  TARGET="amd64"
-fi
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -55,46 +48,33 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-ar xo $CWD/$PRGNAM\_$VERSION-1_$TARGET.deb
-tar xvf data.tar.gz
-mkdir $PRGNAM-$VERSION
-mv usr/ $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$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 {} \;
 
-# Delete unecessary files
-find . -name '*Debian*' -exec rm -rf {} \;
+lazbuild --lazarusdir=/usr/share/lazarus --cpu=$ARCH -B winff.lpr
 
-# Copy executable program
-mkdir -p $PKG/usr/bin
-cp -a usr/bin/* $PKG/usr/bin
+install -m 0755 -D $PRGNAM $PKG/usr/bin/$PRGNAM
 
-# Copy libraries program
 mkdir -p $PKG/usr/share/winff
-cp -a usr/share/winff/* $PKG/usr/share/winff
+cp -a languages $PKG/usr/share/winff/
+zcat $CWD/presets.xml.gz > $PKG/usr/share/winff/presets.xml
 
-# Copy compressed man file
 mkdir -p $PKG/usr/man/man1
-cp -a usr/share/man/man1/* $PKG/usr/man/man1
+gzip -c9 $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
-# Copy desktop entries
-mkdir -p $PKG/usr/share/applications
-cat usr/share/applications/$PRGNAM.desktop > \
-  $PKG/usr/share/applications/$PRGNAM.desktop
+install -m 0644 -D $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
-# Copy icon
-mkdir -p $PKG/usr/share/pixmaps
-cat usr/share/icons/hicolor/48x48/apps/winff.png > $PKG/usr/share/pixmaps/winff.png
+install -m 0644 -D winff-icons/48x48/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 # Copy documentation
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a usr/share/doc/$PRGNAM/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a docs/*.{pdf,txt} $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir $PKG/install
diff --git a/multimedia/winff/winff.desktop b/multimedia/winff/winff.desktop
new file mode 100644
index 0000000000..ff16b3541c
--- /dev/null
+++ b/multimedia/winff/winff.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=WinFF
+Comment=GUI for FFMPEG
+MimeType=application/winff;
+Exec=winff
+Icon=winff
+Terminal=false
+Type=Application
+Categories=AudioVideo;AudioVideoEditing;GTK;
+GenericName=Video converter
+GenericName[en]=Video converter
+GenericName[nl]=Video converteerder
diff --git a/multimedia/winff/winff.info b/multimedia/winff/winff.info
index a7ed0ce2e5..1d0d011e47 100644
--- a/multimedia/winff/winff.info
+++ b/multimedia/winff/winff.info
@@ -1,10 +1,10 @@
 PRGNAM="winff"
-VERSION="1.3.0"
+VERSION="20170714_220b212"
 HOMEPAGE="http://winff.org/"
-DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/multimedia/winff/winff_1.3.0-1_i386.deb"
-MD5SUM="d2d021aa6ebced20de0ca7baeaa236ae"
-DOWNLOAD_x86_64="http://slackware.uk/sbosrcarch/by-name/multimedia/winff/winff_1.3.0-1_amd64.deb"
-MD5SUM_x86_64="dab20991886faae50511ffc70964be30"
-REQUIRES="ffmpeg"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/winff-20170714_220b212.tar.xz"
+MD5SUM="663cb956dd0261106383b1762d79e752"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="lazarus ffmpeg"
 MAINTAINER="nobody"
 EMAIL="nobody@nowhere.com"