diff --git a/Makefile.lib b/Makefile.lib
index cde5a5973..f0219e101 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -181,10 +181,12 @@ TESTDEPS += $(TESTDEPS-yes)
 TEST_LIB=$(top_srcdir)/test/libtest.sh
 export TEST_LIB
 
-define test_prog
-$(1): $(1).o $(TESTDEPS)
-	$$(call cmd,link)
-endef
+# This does the work for the next rule. It is a very general rule
+# but as long as we don't put test programs in src/ it should work.
+%: %.o $(TESTDEPS)
+	$(call cmd,link)
+
+$(TEST_PROGS): $(addsuffix .o,$(TEST_PROGS)) $(TESTDEPS)
 
 TESTS = $(wildcard $(srcdir)test-*)
 
@@ -201,8 +203,6 @@ CLEAN += $(TEST_PROGS) $(addsuffix .o,$(TEST_PROGS))
 clean-default: clean-test
 endif
 
-$(foreach prog,$(TEST_PROGS),$(eval $(call test_prog,$(prog))))
-
 .PHONY: $(TESTS)
 .NOPARALLEL:
 
diff --git a/NEWS b/NEWS
index 61b28556c..b98c48302 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,13 @@ You can see the complete list of recent changes, bugfixes and new features in
 the link:http://pasky.or.cz/gitweb.cgi[gitweb interface]. See the ChangeLog
 file for details.
 
+ELinks now:
+-----------
+
+* Native FSP protocol support (replaces CGI program in contrib/fsp/)
+* SEE Ecmascript backend
+* Minimalistic RSS renderer
+
 ELinks 0.11.0 (Elated):
 -----------------------
 
diff --git a/src/main/object.h b/src/main/object.h
index ea206220c..2d77b2853 100644
--- a/src/main/object.h
+++ b/src/main/object.h
@@ -15,8 +15,7 @@ struct object {
 };
 
 #define OBJECT_HEAD(type)						\
-	type *next;							\
-	type *prev;							\
+	LIST_HEAD(type);						\
 	struct object object
 
 struct object_head {
diff --git a/src/mime/backend/Makefile b/src/mime/backend/Makefile
index eb9300cc5..909bf1dd3 100644
--- a/src/mime/backend/Makefile
+++ b/src/mime/backend/Makefile
@@ -26,6 +26,7 @@ TESTDEPS = \
  $(top_builddir)/src/util/string.o \
  $(top_builddir)/src/util/time.o
 
+TESTDEPS-$(CONFIG_NLS)	 += $(top_builddir)/src/intl/gettext/lib.o
 TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o
 
 include $(top_srcdir)/Makefile.lib
diff --git a/src/mime/backend/mailcap.c b/src/mime/backend/mailcap.c
index e3eccec55..136cc0ee3 100644
--- a/src/mime/backend/mailcap.c
+++ b/src/mime/backend/mailcap.c
@@ -684,7 +684,8 @@ struct module mailcap_mime_module = struct_module(
 /* Some ugly shortcuts for getting defined symbols to work. */
 int default_mime_backend,
     install_signal_handler,
-    mimetypes_mime_backend;
+    mimetypes_mime_backend,
+    program;
 struct list_head terminals;
 
 void die(const char *msg, ...)
diff --git a/src/protocol/ftp/test-ftp-parser b/src/protocol/ftp/test-ftp-parser
index 8cdd536da..860056dde 100644
--- a/src/protocol/ftp/test-ftp-parser
+++ b/src/protocol/ftp/test-ftp-parser
@@ -81,10 +81,10 @@ drwxrwxr-x               folder        2 May 10  1996 network\r\n"
 
 test_ftp_response_expect_success \
 'EPLF responses' \
-$'
-+i8388621.48594,m825718503,r,s280,\tdjb.html\r\n
-+i8388621.50690,m824255907,/,\t514\r\n
-+i8388621.48598,m824253270,r,s612,\t514.html\r\n'
+"
++i8388621.48594,m825718503,r,s280,	djb.html\r\n
++i8388621.50690,m824255907,/,	514\r\n
++i8388621.48598,m824253270,r,s612,	514.html\r\n"
 
 #############################################################################
 #
diff --git a/src/util/Makefile b/src/util/Makefile
index 00fb2cf7d..9c3f47a82 100644
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -1,6 +1,8 @@
 top_builddir=../..
 include $(top_builddir)/Makefile.config
 
+INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
+
 # Reverse a CONFIG_* string
 # Usage $(call not,$(CONFIG_FOO))
 not = $(if $(findstring yes,$(1)),no,yes)
@@ -9,7 +11,6 @@ OBJS-$(call not,$(CONFIG_SMALL))	 += fastfind.o
 OBJS-$(CONFIG_CSS)			 += scanner.o
 OBJS-$(CONFIG_DEBUG)			 += memdebug.o
 OBJS-$(CONFIG_DOM)			 += scanner.o
-OBJS-$(CONFIG_MD5)			 += md5.o
 
 # Use own MD5 implementation if testing libc or there's no OpenSSL
 # (either the real thing or GNUTLS compat wrappers).
diff --git a/src/util/md5.h b/src/util/md5.h
index 7c29c9271..f4f7f4c49 100644
--- a/src/util/md5.h
+++ b/src/util/md5.h
@@ -3,12 +3,14 @@
 
 /* Optionally MD5 support can depend on external implementation when linking
  * against a SSL library that supports it. */
-#ifndef CONFIG_MD5
-#if defined(CONFIG_OPENSSL)
+#if defined(CONFIG_OWN_LIBC)
+#define CONFIG_MD5 1
+#elif defined(CONFIG_OPENSSL)
 #include <openssl/md5.h>
 #elif defined(CONFIG_GNUTLS_OPENSSL_COMPAT)
 #include <gnutls/openssl.h>
-#endif
+#else
+#define CONFIG_MD5 1
 #endif
 
 /* GNU TLS doesn't define this */
diff --git a/src/util/sha1.h b/src/util/sha1.h
index c344c255a..9948a3a7f 100644
--- a/src/util/sha1.h
+++ b/src/util/sha1.h
@@ -36,10 +36,12 @@
 
 /* Optionally SHA1 support can depend on external implementation when linking
  * against a SSL library that supports it. */
-#ifndef CONFIG_SHA1
-#if defined(CONFIG_OPENSSL)
+#if defined(CONFIG_OWN_LIBC)
+#define CONFIG_SHA1 1
+#elif defined(CONFIG_OPENSSL)
 #include <openssl/sha.h>
-#endif
+#else
+#define CONFIG_SHA1 1
 #endif
 
 #ifndef SHA_DIGEST_LENGTH