diff --git a/www-client/netsurf/patches/netsurf-2.HEAD.patch b/www-client/netsurf/patches/netsurf-2.HEAD.patch
index 6c3451327..d47499dad 100644
--- a/www-client/netsurf/patches/netsurf-2.HEAD.patch
+++ b/www-client/netsurf/patches/netsurf-2.HEAD.patch
@@ -12,7 +12,7 @@ index c80378c..428aa74 100644
  	$(Q)$(BEOS_MIMESET) $(EXETARGET)
  endif
 diff --git a/beos/Makefile.target b/beos/Makefile.target
-index b1d1eaa..461ecbc 100644
+index b1d1eaa..958fc62 100644
 --- a/beos/Makefile.target
 +++ b/beos/Makefile.target
 @@ -9,8 +9,10 @@
@@ -39,7 +39,22 @@ index b1d1eaa..461ecbc 100644
    ifeq ($(HOST),beos)
      CFLAGS += -I$(PREFIX)/include
      LDFLAGS += -L$(PREFIX)/lib
-@@ -100,7 +101,7 @@ RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS)))
+@@ -84,11 +85,9 @@
+ # ----------------------------------------------------------------------------
+ 
+ # S_BEOS are sources purely for the BeOS build
+-S_BEOS := about.cpp bitmap.cpp fetch_rsrc.cpp		\
+-	filetype.cpp font.cpp gui.cpp login.cpp		\
+-	gui_options.cpp plotters.cpp 			\
+-	scaffolding.cpp search.cpp schedule.cpp		\
+-	thumbnail.cpp treeview.cpp throbber.cpp		\
++S_BEOS := about.cpp bitmap.cpp download.cpp fetch_rsrc.cpp filetype.cpp \
++	font.cpp gui.cpp login.cpp gui_options.cpp plotters.cpp	scaffolding.cpp \
++	search.cpp schedule.cpp	thumbnail.cpp treeview.cpp throbber.cpp		\
+ 	window.cpp system_colour.cpp
+ S_BEOS := $(addprefix beos/,$(S_BEOS))
+ 
+@@ -100,7 +99,7 @@ RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS)))
  
  RDEP_BEOS := \
  	adblock.css beosdefault.css default.css internal.css quirks.css	\
@@ -48,7 +63,7 @@ index b1d1eaa..461ecbc 100644
  RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS))			\
  	$(wildcard beos/res/Icons/*.png)				\
  	$(wildcard beos/res/throbber/throbber*.png)
-@@ -128,7 +129,7 @@ install-beos:
+@@ -128,7 +127,7 @@ install-beos:
  	@cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
  	@cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
  #	@cp -vRL beos/res/throbber/*.png $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
@@ -85,7 +100,7 @@ index 79dea4e..563f431 100644
  		return false;
  	}
 diff --git a/beos/gui.cpp b/beos/gui.cpp
-index b275616..3f7e943 100644
+index b275616..d951c6c 100644
 --- a/beos/gui.cpp
 +++ b/beos/gui.cpp
 @@ -450,7 +450,6 @@ static void gui_init2(int argc, char** argv)
@@ -171,6 +186,38 @@ index b275616..3f7e943 100644
  #endif
  #endif
  
+@@ -751,31 +749,6 @@ void gui_quit(void)
+ }
+ 
+ 
+-
+-struct gui_download_window *gui_download_window_create(download_context *ctx,
+-		struct gui_window *gui)
+-{
+-	return NULL;
+-}
+-
+-
+-nserror gui_download_window_data(struct gui_download_window *dw, 
+-		const char *data, unsigned int size)
+-{
+-	return NSERROR_OK;
+-}
+-
+-
+-void gui_download_window_error(struct gui_download_window *dw,
+-		const char *error_msg)
+-{
+-}
+-
+-
+-void gui_download_window_done(struct gui_download_window *dw)
+-{
+-}
+-
+ #if 0 /* GTK */
+ static void nsbeos_select_menu_clicked(BCheckMenuItem *checkmenuitem,
+ 					gpointer user_data) 
 diff --git a/beos/login.cpp b/beos/login.cpp
 index 32860de..90cadde 100644
 --- a/beos/login.cpp