diff --git a/libcss/Makefile b/libcss/Makefile
index 9627241..206566e 100644
--- a/libcss/Makefile
+++ b/libcss/Makefile
@@ -24,7 +24,9 @@ endef
 
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \
+		$(MAKE_FLAGS) \
+		WARNFLAGS="" \
 		COMPONENT_TYPE=lib-shared \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
diff --git a/libhubbub/Makefile b/libhubbub/Makefile
index f8329d0..89466cb 100644
--- a/libhubbub/Makefile
+++ b/libhubbub/Makefile
@@ -15,7 +15,7 @@ define Package/libhubbub
 	CATEGORY:=Libraries
 	TITLE:=Hubbub is an HTML5 compliant parsing library
 	URL:=http://www.netsurf-browser.org/projects/hubbub/
-	DEPENDS:=+libparserutils @BROKEN
+	DEPENDS:=+libparserutils
 endef
 
 define Package/libhubbub/description
@@ -24,7 +24,8 @@ endef
 
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \
+		$(MAKE_FLAGS) \
 		COMPONENT_TYPE=lib-shared \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
diff --git a/libnsfb/Makefile b/libnsfb/Makefile
new file mode 100644
index 0000000..8cb0daf
--- /dev/null
+++ b/libnsfb/Makefile
@@ -0,0 +1,56 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libnsfb
+PKG_REV:=10618
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=svn://svn.netsurf-browser.org/trunk/libnsfb
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libnsfb
+	SECTION:=libs
+	CATEGORY:=Libraries
+	TITLE:=LibNSFB is a framebuffer abstraction library, written in C
+	URL:=http://www.netsurf-browser.org/projects/libcss/
+endef
+
+define Package/libnsfb/description
+	The overall idea of the library is to provide a generic abstraction to a linear section of memory which corresponds to a visible array of pixel elements on a display device. Different colour depths are supported and the library provides routines for tasks such as drawing onto the framebuffer and rectangle copy operations.
+endef
+
+define Build/Compile
+	rm -rf $(PKG_INSTALL_DIR)
+	$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \
+		$(MAKE_FLAGS) \
+		WARNFLAGS="" \
+		COMPONENT_TYPE=lib-shared \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/include/* $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/* $(1)/usr/lib/
+	$(SED) \
+		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+		$(1)/usr/lib/pkgconfig/libnsfb.pc
+	$(SED) \
+		's/xcb\|xcb-icccm\|xcb-image\|xcb-keysyms//g' \
+		$(1)/usr/lib/pkgconfig/libnsfb.pc
+endef
+
+define Package/libnsfb/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/libnsfb.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libnsfb))
diff --git a/libnsfb/patches/001-libnsfb.patch b/libnsfb/patches/001-libnsfb.patch
new file mode 100644
index 0000000..5ee9133
--- /dev/null
+++ b/libnsfb/patches/001-libnsfb.patch
@@ -0,0 +1,10 @@
+diff -ur libnsfb.orig/src/surface/Makefile libnsfb/src/surface/Makefile
+--- libnsfb.orig/src/surface/Makefile	2010-11-20 13:13:46.000000000 +0300
++++ libnsfb/src/surface/Makefile	2010-11-20 13:42:01.000000000 +0300
+@@ -1,4 +1,4 @@
+ # Sources
+-DIR_SOURCES := surface.c sdl.c vnc.c able.c ram.c linux.c x.c
++DIR_SOURCES := surface.c sdl.c ram.c linux.c
+ 
+ include build/makefiles/Makefile.subdir
+Только в libnsfb/src/surface: Makefile~
diff --git a/libparserutils/Makefile b/libparserutils/Makefile
index f305aa8..0824a55 100644
--- a/libparserutils/Makefile
+++ b/libparserutils/Makefile
@@ -15,7 +15,7 @@ define Package/libparserutils
 	CATEGORY:=Libraries
 	TITLE:=LibParserUtils has some built-in charset converters
 	URL:=http://www.netsurf-browser.org/projects/libparserutils/
-	DEPENDS:=@BROKEN
+	DEPENDS:=
 endef
 
 define Package/libparserutils/description
@@ -24,7 +24,8 @@ endef
 
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \
+		$(MAKE_FLAGS) \
 		COMPONENT_TYPE=lib-shared \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
diff --git a/libwapcaplet/Makefile b/libwapcaplet/Makefile
index bb4b278..a2a040b 100644
--- a/libwapcaplet/Makefile
+++ b/libwapcaplet/Makefile
@@ -23,7 +23,8 @@ endef
 
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \
+		$(MAKE_FLAGS) \
 		COMPONENT_TYPE=lib-shared \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
diff --git a/netsurf/Makefile b/netsurf/Makefile
index 1067daf..01ea60c 100644
--- a/netsurf/Makefile
+++ b/netsurf/Makefile
@@ -11,6 +11,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.netsurf-browser.org/downloads/development/
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/netsurf
@@ -19,15 +21,18 @@ define Package/netsurf
 	CATEGORY:=Network
 	TITLE:=netsurf
 	URL:=http://www.netsurf-browser.org/
-	DEPENDS:=+libsdl +libcss +libhubbub +libparserutils @BROKEN
+	DEPENDS:=+libsdl +libcss +libhubbub +libparserutils +libnsfb +libxml2 +libcurl
 endef
 
 define Package/netsurf/description
 	NetSurf is a free, open source web browser. It is written in C and released under the GNU Public Licence version 2. NetSurf has its own layout and rendering engine entirely written from scratch. It is small and capable of handling many of the web standards in use today.
 endef
 
-MAKE_VARS +=
+MAKE_FLAGS += "TARGET=framebuffer" \
+			  "PREFIX=/usr"
+
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/SDL
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
@@ -36,11 +41,15 @@ endef
 
 define Package/netsurf/install
 	$(INSTALL_DIR) \
-		$(1)/usr/bin \
+		$(1)/usr/bin $(1)/usr/share/netsurf
 
 	$(INSTALL_BIN) \
-		./files/netsurf \
+		$(PKG_INSTALL_DIR)/usr/bin/netsurf \
 		$(1)/usr/bin/
+
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/share/netsurf/* \
+		$(1)/usr/share/netsurf/
 endef
 
 $(eval $(call BuildPackage,netsurf))
diff --git a/netsurf/files/Makefile.config b/netsurf/files/Makefile.config
new file mode 100644
index 0000000..0bf00fc
--- /dev/null
+++ b/netsurf/files/Makefile.config
@@ -0,0 +1,16 @@
+#
+# NetSurf build configuration example
+#
+#
+# To configure NetSurf's build options create a Makefile.config file. This is
+# an example Makefile.config.
+#
+# To see the available config options, look at Makefile.defaults
+
+
+# For example, by default, NetSurf builds with BMP support.  If you
+# wish to disable this, then uncomment the following line.
+
+override NETSURF_USE_BMP := NO
+override NETSURF_USE_GIF := NO
+override NETSURF_USE_MNG := NO