 +override NETSURF_FB_FONT_MONOSPACE_BOLD := Mono/Fira/Bold.ttf
 +override NETSURF_FB_FONT_CURSIVE := Sans/Fira/Regular.ttf
 +override NETSURF_FB_FONT_FANTASY := Sans/Fira/Regular.ttf
-diff -rupNw source-original/netsurf/render/form.c source/netsurf/render/form.c
---- source-original/netsurf/render/form.c	2017-10-16 12:09:36.000000000 +0200
-+++ source/netsurf/render/form.c	2018-03-09 00:03:07.456378705 +0100
-@@ -1080,7 +1080,7 @@ char *form_encode_item(const char *item,
+diff -ruwN source/netsurf/render/form.c source-new/netsurf/render/form.c
+--- source/netsurf/render/form.c	2017-10-16 04:09:36.000000000 -0600
++++ source-new/netsurf/render/form.c	2018-12-29 08:29:56.855249826 -0700
+@@ -1080,7 +1080,7 @@
  	if (!item || !charset)
  		return NULL;
  

diff -rupNw source-original/libnsfb/Makefile source/libnsfb/Makefile
--- source-original/libnsfb/Makefile	2017-10-16 12:09:35.000000000 +0200
+++ source/libnsfb/Makefile	2018-03-04 20:43:18.172956846 +0100
@@ -43,10 +43,10 @@ endif
 NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom
 
 # determine which surface handlers can be compiled based upon avalable library

 
 # surfaces not detectable via pkg-config 
 NSFB_ABLE_AVAILABLE := no
diff -ruwN source/libnsfb/src/plot.h source-new/libnsfb/src/plot.h
--- source/libnsfb/src/plot.h	2017-10-16 04:09:35.000000000 -0600
+++ source-new/libnsfb/src/plot.h	2018-12-29 08:29:56.855249826 -0700
@@ -36,7 +36,7 @@
         #define NSFB_BE_BYTE_ORDER
     #endif
