diff --git a/network/elinks/README b/network/elinks/README
index 97574a8664..83365bb46a 100644
--- a/network/elinks/README
+++ b/network/elinks/README
@@ -63,4 +63,7 @@ Note that Unicode combining characters is marked as experimental.
 
 Optional dependencies apart from scripting languages stated above:
 
-tre:  for regex search support
+tre: for regex search support
+
+Note: this version uses the last commit in elinks' git repo, before it
+was forked into felinks (f86be659718c0cd0a67f88b42f07044c23d0d028).
diff --git a/network/elinks/elinks.SlackBuild b/network/elinks/elinks.SlackBuild
index 93cee7bfac..fdac5bf88b 100644
--- a/network/elinks/elinks.SlackBuild
+++ b/network/elinks/elinks.SlackBuild
@@ -22,8 +22,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=elinks
-VERSION=${VERSION:-git20131231}
-BUILD=${BUILD:-13}
+VERSION=${VERSION:-git20170723}
+COMMIT=f86be659
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -40,10 +41,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Added -fno-strict-aliasing -Wno-pointer-sign for a much more peaceful build
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
@@ -63,9 +61,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.?z
+cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -114,7 +112,7 @@ done
 [ "${NNTP:-no}"       = "yes" ] && nntp="--enable-nntp"
 [ "${SMB:-no}"        = "yes" ] && smb="--enable-smb"
 
-autoreconf
+./autogen.sh
 CFLAGS="$SLKCFLAGS -L/usr/lib64" \
   ./configure \
   --prefix=/usr \
@@ -154,6 +152,9 @@ CFLAGS="$SLKCFLAGS -L/usr/lib64" \
 
 make
 make install DESTDIR=$PKG
+cd doc
+make html
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -162,11 +163,13 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/html doc/*txt \
-  contrib \
+  AUTHORS BUGS COPYING NEWS README SITES THANKS TODO ChangeLog contrib \
+  doc/*txt doc/manual.html-chunked \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/manual.html-chunked/manual.proc
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/elinks/elinks.info b/network/elinks/elinks.info
index 17553cf0cf..267545e39a 100644
--- a/network/elinks/elinks.info
+++ b/network/elinks/elinks.info
@@ -1,8 +1,8 @@
 PRGNAM="elinks"
-VERSION="git20131231"
+VERSION="git20170723"
 HOMEPAGE="http://elinks.or.cz"
-DOWNLOAD="http://www.unrealize.co.uk/source/elinks-git20131231.tar.xz"
-MD5SUM="3b3b57ac6b9bafe123d046f342272d17"
+DOWNLOAD="http://www.unrealize.co.uk/source/elinks-f86be659.tar.gz"
+MD5SUM="86c2270d083d25573609adb827eb1a04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/elinks/patches/0000-force-text-wrap.patch b/network/elinks/patches/0000-force-text-wrap.patch
new file mode 100644
index 0000000000..4705cb0893
--- /dev/null
+++ b/network/elinks/patches/0000-force-text-wrap.patch
@@ -0,0 +1,26 @@
+# This wraps <pre> text too when "W" is pressed.
+# (main toggle-wrap-text)
+diff --git a/src/document/html/renderer.c b/src/document/html/renderer.c
+index 6470c54..a40a4ef 100644
+--- a/src/document/html/renderer.c
++++ b/src/document/html/renderer.c
+@@ -1801,7 +1801,7 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
+ 
+ 	renderer_context.nobreak = 0;
+ 
+-	if (!(html_context->options->wrap || html_is_preformatted())) {
++	if (html_context->options->wrap || !html_is_preformatted()) {
+ 		while (part->cx > overlap(par_format)
+ 		       && part->cx > par_format.leftmargin) {
+ 			int x = split_line(html_context);
+@@ -1822,9 +1822,7 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
+ 	int_lower_bound(&part->max_width, part->xa
+ 			+ par_format.leftmargin + par_format.rightmargin
+ 			- (chars[charslen - 1] == ' '
+-			   && !html_is_preformatted()));
+-	return;
+-
++               && (html_context->options->wrap || !html_is_preformatted())));
+ }
+ 
+ #undef overlap
diff --git a/network/elinks/patches/0004-ssl_cert_verify.patch b/network/elinks/patches/0004-ssl_cert_verify.patch
index 3b56e1ae40..6bb1748856 100644
--- a/network/elinks/patches/0004-ssl_cert_verify.patch
+++ b/network/elinks/patches/0004-ssl_cert_verify.patch
@@ -123,18 +123,6 @@ diff -Naur a/src/network/ssl/socket.c b/src/network/ssl/socket.c
  
  	if (get_opt_bool("connection.ssl.client_cert.enable", NULL)) {
  		unsigned char *client_cert;
-diff -Naur a/src/network/ssl/ssl.c b/src/network/ssl/ssl.c
---- a/src/network/ssl/ssl.c	2017-12-21 15:58:12.553249389 +0000
-+++ b/src/network/ssl/ssl.c	2017-12-21 16:11:03.378949490 +0000
-@@ -109,7 +109,7 @@
- 
- static union option_info openssl_options[] = {
- 	INIT_OPT_BOOL("connection.ssl", N_("Verify certificates"),
--		"cert_verify", 0, 0,
-+		"cert_verify", 0, 1,
- 		N_("Verify the peer's SSL certificate. Note that this "
- 		"needs extensive configuration of OpenSSL by the user.")),
- 
 diff -Naur a/src/network/state.c b/src/network/state.c
 --- a/src/network/state.c	2017-12-21 15:58:12.553249389 +0000
 +++ b/src/network/state.c	2017-12-21 16:10:20.579746621 +0000