 +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,
+ 	if (!item || !charset)
+ 		return NULL;
+ 
+-	snprintf(cset, sizeof cset, "%s//TRANSLIT", charset);
++	snprintf(cset, sizeof cset, "%s", charset);
+ 
+ 	err = utf8_to_enc(item, cset, 0, &ret);
+ 	if (err == NSERROR_BAD_ENCODING) {
+@@ -1092,7 +1092,7 @@ char *form_encode_item(const char *item,
+ 			/* nope, try fallback charset (if any) */
+ 			if (fallback) {
+ 				snprintf(cset, sizeof cset, 
+-						"%s//TRANSLIT", fallback);
++						"%s", fallback);
+ 				err = utf8_to_enc(item, cset, 0, &ret);
+ 
+ 				if (err == NSERROR_BAD_ENCODING) {
+@@ -1105,7 +1105,7 @@ char *form_encode_item(const char *item,
+ 
+ 			if (err == NSERROR_BAD_ENCODING) {
+ 				/* that also failed, use 8859-1 */
+-				err = utf8_to_enc(item, "ISO-8859-1//TRANSLIT",
++				err = utf8_to_enc(item, "ISO-8859-1",
+ 						0, &ret);
+ 				if (err == NSERROR_BAD_ENCODING) {
+ 					/* and without transliteration */
 diff -rupNw source-original/netsurf/utils/log.c source/netsurf/utils/log.c
 --- source-original/netsurf/utils/log.c	2017-10-16 12:09:36.000000000 +0200
-+++ source/netsurf/utils/log.c	2018-02-28 15:55:23.855716815 +0100
++++ source/netsurf/utils/log.c	2018-03-04 20:43:18.252957604 +0100
 @@ -261,18 +261,18 @@ nserror nslog_init(nslog_ensure_t *ensur
  	/* sucessfull logging initialisation so log system info */
  	if (ret == NSERROR_OK) {

 	size_t buf_size;
diff -rupNw source-original/netsurf/content/urldb.c source/netsurf/content/urldb.c
--- source-original/netsurf/content/urldb.c	2017-10-16 12:09:36.000000000 +0200
+++ source/netsurf/content/urldb.c	2018-02-28 15:55:23.851716655 +0100
@@ -630,7 +630,7 @@ static bool urldb__host_is_ip_address(co
 	size_t host_len = strlen(host);
 	const char *sane_host;

     if (got_event == 0) {
diff -rupNw source-original/libparserutils/src/input/filter.c source/libparserutils/src/input/filter.c
--- source-original/libparserutils/src/input/filter.c	2017-10-16 12:09:36.000000000 +0200
+++ source/libparserutils/src/input/filter.c	2018-03-04 20:43:18.188956997 +0100
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
