diff --git a/surf-git/distinfo b/surf-git/distinfo
new file mode 100644
index 0000000000..2cd0974095
--- /dev/null
+++ b/surf-git/distinfo
@@ -0,0 +1,4 @@
+$NetBSD$
+
+SHA1 (patch-libsurf-webext.c) = fedcab069e6859b14a573905257bf562244b2591
+SHA1 (patch-surf.c) = e9df463148856a838842b9e8f8d8a5383de7e509
diff --git a/surf-git/patches/patch-libsurf-webext.c b/surf-git/patches/patch-libsurf-webext.c
new file mode 100644
index 0000000000..4ee87a9990
--- /dev/null
+++ b/surf-git/patches/patch-libsurf-webext.c
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Fix negative values in scrollh()/scrollv().
+
+Shared upstream via:
+
+ <https://lists.suckless.org/hackers/1906/16887.html>
+
+--- libsurf-webext.c.orig	2020-06-01 15:14:21.000000000 +0000
++++ libsurf-webext.c
+@@ -91,14 +91,14 @@ readpipe(GIOChannel *s, GIOCondition c, 
+ 			return TRUE;
+ 		ww = webkit_dom_dom_window_get_inner_width(view);
+ 		webkit_dom_dom_window_scroll_by(view,
+-		                                (ww / 100) * msg[3], 0);
++		                                (ww / 100) * (signed char)msg[3], 0);
+ 		break;
+ 	case 'v':
+ 		if (msgsz != 4)
+ 			return TRUE;
+ 		wh = webkit_dom_dom_window_get_inner_height(view);
+ 		webkit_dom_dom_window_scroll_by(view,
+-		                                0, (wh / 100) * msg[3]);
++		                                0, (wh / 100) * (signed char)msg[3]);
+ 		break;
+ 	}
+ 
diff --git a/surf-git/patches/patch-surf.c b/surf-git/patches/patch-surf.c
new file mode 100644
index 0000000000..9c123f5e05
--- /dev/null
+++ b/surf-git/patches/patch-surf.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Set URI atom for WEBKIT_LOAD_COMMITTED event too.
+
+Shared upstream via:
+
+ <https://lists.suckless.org/hackers/2008/17553.html>
+
+--- surf.c.orig	2020-06-01 15:14:21.000000000 +0000
++++ surf.c
+@@ -1513,6 +1513,7 @@ loadchanged(WebKitWebView *v, WebKitLoad
+ 		seturiparameters(c, uri, loadtransient);
+ 		break;
+ 	case WEBKIT_LOAD_COMMITTED:
++		setatom(c, AtomUri, uri);
+ 		seturiparameters(c, uri, loadcommitted);
+ 		c->https = webkit_web_view_get_tls_info(c->view, &c->cert,
+ 		                                        &c->tlserr);