diff --git a/.SRCINFO b/.SRCINFO
index c34f7ce..9e20847 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = st
 	pkgdesc = A simple virtual terminal emulator for X.
-	pkgver = 0.8.3
+	pkgver = 0.8.4
 	pkgrel = 1
 	url = https://st.suckless.org
 	arch = i686
@@ -8,15 +8,15 @@ pkgbase = st
 	arch = armv7h
 	license = MIT
 	depends = libxft
-	source = https://dl.suckless.org/st/st-0.8.3.tar.gz
+	source = https://dl.suckless.org/st/st-0.8.4.tar.gz
 	source = config.h
 	source = https://st.suckless.org/patches/nordtheme/st-nordtheme-0.8.2.diff
 	source = https://st.suckless.org/patches/scrollback/st-scrollback-20200419-72e3f6c.diff
 	source = https://st.suckless.org/patches/scrollback/st-scrollback-mouse-20191024-a2c479c.diff
 	source = terminfo.patch
 	source = README.terminfo.rst
-	sha256sums = 939ae3da237e7c9489694853c205c7cbd5f2a2f0c17fe41a07477f1df8e28552
-	sha256sums = e142793fc958f724e8e5867688d53f83c48cab7a5fe8a695568ccb2c79e23047
+	sha256sums = d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6
+	sha256sums = 55447cf1516b401cf4d7c72544b58e957d1577fb9f33eb968442f2b72860b644
 	sha256sums = 01de8a6d0d855c31496c7963e78edb7565a81b60dcb9e9f00dd3eab1f43b526b
 	sha256sums = 1e41fe17a5ef5a8194eea07422b49d815e2c2bb4d58d84771f793be423005310
 	sha256sums = 319458d980195d18fa0f81a6898d58f8d046c5ff982ab872d741f54bb60e267d
diff --git a/PKGBUILD b/PKGBUILD
index 1d67232..3c6d3d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Christoph Vigano <mail@cvigano.de>
 
 pkgname=st
-pkgver=0.8.3
+pkgver=0.8.4
 pkgrel=1
 pkgdesc='A simple virtual terminal emulator for X.'
 arch=('i686' 'x86_64' 'armv7h')
@@ -14,12 +14,12 @@ url=https://st.suckless.org
 source=(https://dl.suckless.org/$pkgname/$pkgname-$pkgver.tar.gz
         config.h
         https://st.suckless.org/patches/nordtheme/st-nordtheme-0.8.2.diff
-	https://st.suckless.org/patches/scrollback/st-scrollback-20200419-72e3f6c.diff
-	https://st.suckless.org/patches/scrollback/st-scrollback-mouse-20191024-a2c479c.diff
+        https://st.suckless.org/patches/scrollback/st-scrollback-20200419-72e3f6c.diff
+        https://st.suckless.org/patches/scrollback/st-scrollback-mouse-20191024-a2c479c.diff
         terminfo.patch
         README.terminfo.rst)
-sha256sums=('939ae3da237e7c9489694853c205c7cbd5f2a2f0c17fe41a07477f1df8e28552'
-            'e142793fc958f724e8e5867688d53f83c48cab7a5fe8a695568ccb2c79e23047'
+sha256sums=('d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6'
+            '55447cf1516b401cf4d7c72544b58e957d1577fb9f33eb968442f2b72860b644'
             '01de8a6d0d855c31496c7963e78edb7565a81b60dcb9e9f00dd3eab1f43b526b'
             '1e41fe17a5ef5a8194eea07422b49d815e2c2bb4d58d84771f793be423005310'
             '319458d980195d18fa0f81a6898d58f8d046c5ff982ab872d741f54bb60e267d'
@@ -65,8 +65,9 @@ prepare() {
   # apply patches
   cd $srcdir/$pkgname-$pkgver/
   patch -p1 config.h < $srcdir/st-nordtheme-0.8.2.diff
+  sed -i 's/config.def.h/config.h/g' $srcdir/st-scrollback-20200419-72e3f6c.diff
   patch -p1 < $srcdir/st-scrollback-20200419-72e3f6c.diff
-  patch -p1 < $srcdir/st-scrollback-mouse-20191024-a2c479c.diff
+  patch -p1 config.h < $srcdir/st-scrollback-mouse-20191024-a2c479c.diff
 }
 
 build() {
diff --git a/config.h b/config.h
index 920e310..6562f1e 100644
--- a/config.h
+++ b/config.h
@@ -43,9 +43,18 @@ static unsigned int tripleclicktimeout = 600;
 /* alt screens */
 int allowaltscreen = 1;
 
-/* frames per second st should at maximum draw to the screen */
-static unsigned int xfps = 120;
-static unsigned int actionfps = 30;
+/* allow certain non-interactive (insecure) window operations such as:
+   setting the clipboard text */
+int allowwindowops = 0;
+
+/*
+ * draw latency range in ms - from new content/keypress/etc until drawing.
+ * within this range, st draws when content stops arriving (idle). mostly it's
+ * near minlatency, but it waits longer for slow updates to avoid partial draw.
+ * low minlatency will tear/flicker more, as it can "detect" idle too early.
+ */
+static double minlatency = 8;
+static double maxlatency = 33;
 
 /*
  * blinking timeout (set to 0 to disable blinking) for the terminal blinking
@@ -160,16 +169,15 @@ static unsigned int defaultattr = 11;
 static uint forcemousemod = ShiftMask;
 
 /*
-
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.
  */
 static MouseShortcut mshortcuts[] = {
 	/* mask                 button   function        argument       release */
-	{ ShiftMask,		Button4, kscrollup,	 {.i = 1} },
-	{ ShiftMask,		Button5, kscrolldown,	 {.i = 1} },
 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
+	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
+	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} },
 	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
 };
 
@@ -191,8 +199,6 @@ static Shortcut shortcuts[] = {
 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-	{ ShiftMask,		XK_Page_Up,	kscrollup,	{.i = -1} },
-	{ ShiftMask,		XK_Page_Down,	kscrolldown,	{.i = -1} },
 };
 
 /*