diff --git a/network/netsurf/README b/network/netsurf/README
index c1b2a1ca1b..d200454389 100644
--- a/network/netsurf/README
+++ b/network/netsurf/README
@@ -2,3 +2,5 @@ NetSurf is a free, open source web browser. It is written in C and released
under the GNU Public Licence version 2. NetSurf has its own layout and
rendering engine entirely written from scratch. It is small and capable of
handling many of the web standards in use today.
+
+Scroll patch suggested by João Carvalho.
diff --git a/network/netsurf/netsurf.SlackBuild b/network/netsurf/netsurf.SlackBuild
index 5658e8ee5e..d1c87b73b6 100644
--- a/network/netsurf/netsurf.SlackBuild
+++ b/network/netsurf/netsurf.SlackBuild
@@ -24,8 +24,9 @@
PRGNAM=netsurf
VERSION=${VERSION:-3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
+JAVASCRIPT=${JAVASCRIPT:-YES}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -74,7 +75,16 @@ find -L . \
patch -d src/nsgenbind-0.0.1/src < $CWD/nsgenbind-lexer.l.patch
patch -d src/nsgenbind-0.0.1/src < $CWD/webidl-lexer.l.patch
-make install DESTDIR=$PKG PREFIX=/usr
+# Scroll patch so it changes 30 lines a time instead of one
+# thanks to Sabotage-Linux@git
+# https://github.com/sabotage-linux/sabotage/blob/master/KEEP/netsurf-3.0-scrollspeed.patch
+patch -d src/netsurf-3.0/gtk/res/ < $CWD/scroll.patch
+
+if [ "$JAVASCRIPT" == "YES" ]; then
+ PATH="$(pwd)/src/nsgenbind-0.0.1/build-Linux-gtk-release-binary":$PATH make install DESTDIR=$PKG PREFIX=/usr NETSURF_USE_MOZJS=YES
+else
+ make install DESTDIR=$PKG PREFIX=/usr
+fi
mkdir $PKG/usr/share/pixmaps
cp src/netsurf-3.0/gtk/res/netsurf.png $PKG/usr/share/pixmaps
diff --git a/network/netsurf/netsurf.desktop b/network/netsurf/netsurf.desktop
index 2621854994..5764a8eb0e 100644
--- a/network/netsurf/netsurf.desktop
+++ b/network/netsurf/netsurf.desktop
@@ -1,4 +1,5 @@
[Desktop Entry]
+Encoding=UTF-8
Type=Application
Name=Netsurf
GenericName=Web Browser
@@ -7,5 +8,5 @@ Exec=netsurf %U
Icon=netsurf
Terminal=false
StartupNotify=false
-Categories=Network;
+Categories=Application;Network;
MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;
diff --git a/network/netsurf/scroll.patch b/network/netsurf/scroll.patch
new file mode 100644
index 0000000000..1d5f6aaabe
--- /dev/null
+++ b/network/netsurf/scroll.patch
@@ -0,0 +1,19 @@
+diff -rupN a/src/netsurf-3.0/gtk/res/tabcontents.gtk2.ui b/src/netsurf-3.0/gtk/res/tabcontents.gtk2.ui
+--- a/src/netsurf-3.0/gtk/res/tabcontents.gtk2.ui 2013-04-19 21:27:45.000000000 +0100
++++ b/src/netsurf-3.0/gtk/res/tabcontents.gtk2.ui 2014-01-17 11:47:53.000000000 +0000
+@@ -79,13 +79,13 @@
+
+
+