diff --git a/README.md b/README.md
index b830f7b9f..b584337fc 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ this port requires CoreFoundation, and CoreGraphics dependencies. This
 port compiles with just basic GNUstep base, gui, and back libraries 
 unlike the cocoa port.
 
-To build, follow the instructions on the quickstart link below, replace netsurf in the generated `workspace` folder with this, and run `./gnustepbuild.sh`. Note that you'll need gmake on openbsd.
+To build, follow the instructions on the quickstart link below, replace netsurf in the generated `workspace` folder with this, and run `make TARGET=gnustep`.
 
 ![Screenshot](/screenshots/screenshot.jpeg)
 With Rik theme, client side decorations and mac-style menu.
diff --git a/frontends/gnustep/DownloadManager.m b/frontends/gnustep/DownloadManager.m
index d507cbc88..036698191 100644
--- a/frontends/gnustep/DownloadManager.m
+++ b/frontends/gnustep/DownloadManager.m
@@ -60,6 +60,7 @@
 		NSLog(@"Error: expected download thread to be initialized");
 		return NO;
 	}
+	[data retain];
 	[self performSelector: @selector(reallyWriteData:) onThread: downloadThread
 		withObject: data waitUntilDone: NO modes: [NSArray arrayWithObject:
 		NSDefaultRunLoopMode]];
diff --git a/frontends/gnustep/Makefile.defaults b/frontends/gnustep/Makefile.defaults
new file mode 100644
index 000000000..2f9236a22
--- /dev/null
+++ b/frontends/gnustep/Makefile.defaults
@@ -0,0 +1,22 @@
+# ----------------------------------------------------------------------------
+# GNUstep-specific options
+# ----------------------------------------------------------------------------
+
+# Where to search for NetSurf's resources after looking in ~/.netsurf and
+# $NETSURFRES.  It must have a trailing /
+NETSURF_GNUSTEP_RES_PATH := $(PREFIX)/share/netsurf/:./frontends/gnustep/res/
+
+# Disable javascript for the moment
+NETSURF_USE_DUKTAPE := NO
+
+# Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs
+# Valid options: YES, NO, AUTO
+NETSURF_USE_RSVG := AUTO
+
+# Enable NetSurf's use of libsvgtiny for displaying SVGs
+# Valid options: YES, NO, AUTO
+NETSURF_USE_NSSVG := AUTO
+
+# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
+# Valid options: YES, NO, AUTO
+NETSURF_USE_ROSPRITE := AUTO
diff --git a/gnustepbuild.sh b/gnustepbuild.sh
deleted file mode 100755
index f1393731b..000000000
--- a/gnustepbuild.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-make TARGET=gnustep NETSURF_USE_DUKTAPE=NO NETSURF_USE_NSSVG=YES NETSURF_USE_ROSPRITE=AUTO