diff --git a/www-client/links/additional-files/links.rdef.in b/www-client/links/additional-files/links.rdef.in
new file mode 100644
index 000000000..47887c121
--- /dev/null
+++ b/www-client/links/additional-files/links.rdef.in
@@ -0,0 +1,43 @@
+
+resource app_flags B_MULTIPLE_LAUNCH | B_ARGV_ONLY;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+	variety = B_APPV_FINAL,
+	internal = 0,
+	short_info = "Links",
+	long_info = "A graphics and text mode web browser"
+};
+
+resource app_signature "application/x-vnd.links";
+
+resource vector_icon {
+	$"6E6369661305000200060237E670B8880E39469D39AE144A52234B0D2500C6D7"
+	$"F5FF6B94DD03EC6666020006023B2B47BB18653D0FA53D225148297046CA1900"
+	$"00FF00FFA9FF00020016023B2B47BB18653D0FA53D225148297046CA1900FFFF"
+	$"8A020006023B3049396B0ABA90833C646E4A101543299500FFFFFFFF52FF5202"
+	$"0016023B3049396B0ABA90833C646E4A101543299500FFFFC9020006023C71E3"
+	$"3A0C78BA15E43C7D2149055549455700E3EDFFFF9EC2FF020006023CD8653068"
+	$"26B065D13CD5A34A6E4A46E21900FFDCDCFFDA5858020006023A1DA6393F04BB"
+	$"B5BC3C6B074AEA364809110087CA05FF026802020016023C00913B1266BB9E06"
+	$"3C5B934A01F04914EC00FFFF4E03003CB00200060230B31E3A09B9BB024238A1"
+	$"2F4BAB534AFF0B00A3043CFFFFDCE603CD4D4D030D296402000602BD498B3E11"
+	$"59BF219BBE7D2F4BE71F4AB31300C13E3EFFE27A7A040174020016023F2938BB"
+	$"F60A3BA9823EEC25C40E6348C15D0099FF00020016023E8FA33A7B71BA9D783E"
+	$"B2C049F7BAC28CE500C8FF00130A06322E323E42464C3C4C2C3D260A04322E32"
+	$"3E424642350A04322E42354C2C3D260A04423542464C3C4C2C0A0338423C4D3C"
+	$"440A08335C395C41544F5C555C6051594D3E510A0422422252325A32490A0422"
+	$"4232493C402D3A0A043249325A3C503C400A043E424E495840493A0A043E524E"
+	$"5A4E493E420A1243C97143C374BF66C2A83F503C5133C4EF3330342F3830382D"
+	$"2927292A2C2C2D2E2DC2F1B7B0C3BDB5E0C357B5E0C4A90A042C252927382D3B"
+	$"2B0A04364B334D3E5241500A0442463F48434A46480A042A4727492B4B2E490A"
+	$"04382D38303B2E3B2B0A04434A4358465646480A04332F334D364B362D160A10"
+	$"01052020230A1001052022120A00010030103701178400040A0101012010370A"
+	$"0B01032010370A0E0104201D250A0101072020230A00010030101C0117840004"
+	$"0A02010A2004080A0C010320101C0A0801092004080A00010030283901178400"
+	$"040A0401012028390A0601022028390A0A01032028390A000100302A20011784"
+	$"00040A030101202A200A050102202A200A090103202A200A12040C0D0E0F000A"
+	$"0003101211000A11010B00"
+};
diff --git a/www-client/links/links-2.20.2.recipe b/www-client/links/links-2.21.recipe
similarity index 78%
rename from www-client/links/links-2.20.2.recipe
rename to www-client/links/links-2.21.recipe
index 1e39a3b90..6ad7c5c6f 100644
--- a/www-client/links/links-2.20.2.recipe
+++ b/www-client/links/links-2.21.recipe
@@ -1,15 +1,18 @@
 SUMMARY="A graphics and text mode web browser"
 DESCRIPTION="Links is a multi-platform web browser you can run in Terminal."
 HOMEPAGE="http://links.twibright.com/"
-COPYRIGHT="1999-2019 Mikulas Patocka
+COPYRIGHT="1999-2020 Mikulas Patocka
 	2000-2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://links.twibright.com/download/links-$portVersion.tar.bz2"
-CHECKSUM_SHA256="4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424"
+CHECKSUM_SHA256="285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63"
+
+PATCHES="links-$portVersion.patchset"
+ADDITIONAL_FILES="links.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 commandSuffix=$secondaryArchSuffix
 commandBinDir=$binDir
@@ -57,7 +60,7 @@ BUILD_REQUIRES="
 	devel:libpng16$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix >= 1.2.8
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
@@ -86,5 +89,16 @@ BUILD()
 INSTALL()
 {
 	make install
+
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="0"
+	sed \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		$portDir/additional-files/links.rdef.in > links.rdef
+
+	addResourcesToBinaries links.rdef $commandBinDir/links
 	addAppDeskbarSymlink $commandBinDir/links Links
 }
diff --git a/www-client/links/patches/links-2.21.patchset b/www-client/links/patches/links-2.21.patchset
new file mode 100644
index 000000000..f4c1a9769
--- /dev/null
+++ b/www-client/links/patches/links-2.21.patchset
@@ -0,0 +1,31 @@
+From 63cff3bca4fe5f08144c165f1c3df0067ea3c29e Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 23 Aug 2020 12:57:23 +1000
+Subject: Use DispatchMessage instead MessageReceived
+
+
+diff --git a/haiku.cpp b/haiku.cpp
+index 8031d8f..f21b8f2 100644
+--- a/haiku.cpp
++++ b/haiku.cpp
+@@ -77,7 +77,7 @@ class LinksView : public BView {
+ 	virtual void MouseUp(BPoint p);
+ 	virtual void MouseMoved(BPoint p, uint32 transit, const BMessage *dragmsg);
+ 	virtual void KeyDown(const char *s, int32 numBytes);
+-	virtual void MessageReceived(BMessage *msg);
++	virtual void DispatchMessage(BMessage *msg);
+ 	LinksWindow *win;
+ 	struct graphics_device *dev;
+ 	void d_flush();
+@@ -558,7 +558,7 @@ void LinksView::MouseMoved(BPoint p, uint32 transit, const BMessage *dragmsg)
+ 	detach_and_pipe_message(dev);
+ }
+ 
+-void LinksView::MessageReceived(BMessage *msg)
++void LinksView::DispatchMessage(BMessage *msg)
+ {
+ 	switch (msg->what) {
+ 	case B_MOUSE_WHEEL_CHANGED:
+-- 
+2.28.0
+