diff --git a/disable-stalling-test.patch b/disable-stalling-test.patch
index 22f819c..6b02943 100644
--- a/disable-stalling-test.patch
+++ b/disable-stalling-test.patch
@@ -1,7 +1,7 @@
-Index: libmicrohttpd-0.9.42/src/testcurl/test_start_stop.c
+Index: libmicrohttpd-0.9.48/src/testcurl/test_start_stop.c
 ===================================================================
---- libmicrohttpd-0.9.42.orig/src/testcurl/test_start_stop.c
-+++ libmicrohttpd-0.9.42/src/testcurl/test_start_stop.c
+--- libmicrohttpd-0.9.48.orig/src/testcurl/test_start_stop.c
++++ libmicrohttpd-0.9.48/src/testcurl/test_start_stop.c
 @@ -108,21 +108,6 @@ main (int argc, char *const *argv)
  {
    unsigned int errorCount = 0;
diff --git a/libmicrohttpd-0.9.47.tar.gz b/libmicrohttpd-0.9.47.tar.gz
deleted file mode 100644
index 0028911..0000000
--- a/libmicrohttpd-0.9.47.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:96bdab4352a09fd3952a346bc01898536992f50127d0adea1c3096a8ec9f658c
-size 1075636
diff --git a/libmicrohttpd-0.9.47.tar.gz.sig b/libmicrohttpd-0.9.47.tar.gz.sig
deleted file mode 100644
index bfd78d6..0000000
Binary files a/libmicrohttpd-0.9.47.tar.gz.sig and /dev/null differ
diff --git a/libmicrohttpd-0.9.48.tar.gz b/libmicrohttpd-0.9.48.tar.gz
new file mode 100644
index 0000000..35b911d
--- /dev/null
+++ b/libmicrohttpd-0.9.48.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87667e158f2bf8c691a002e256ffe30885d4121a9ee4143af0320c47cdf8a2a4
+size 1077473
diff --git a/libmicrohttpd-0.9.48.tar.gz.sig b/libmicrohttpd-0.9.48.tar.gz.sig
new file mode 100644
index 0000000..1560994
Binary files /dev/null and b/libmicrohttpd-0.9.48.tar.gz.sig differ
diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes
index e825c3a..e8a448b 100644
--- a/libmicrohttpd.changes
+++ b/libmicrohttpd.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sun Dec 20 09:24:05 UTC 2015 - mpluskal@suse.com
+
+- Update to 0.9.4
+  * Improved compatibility with VS2010 and other older compilers.
+  * Default backlog size for listen socket was changed from 32 to 
+		SOMAXCONN, added new option MHD_OPTION_LISTEN_BACKLOG_SIZE to 
+		override default backlog size.
+  * If not all connections can be handled by MHD_select() than at 
+		least some of connections will be processed instead of failing 
+		without any processing.
+  * Fixed redefenition of FD_SETSIZE on W32 so select() will work 
+		with 2000 connections instead of 64.
+  * Better handled redefenition of FD_SETSIZE on all platforms.
+  * Close sockets more aggressively in multi-threaded mode 
+		(possibly relevant for idle servers).
+- Update dependencies
+
 -------------------------------------------------------------------
 Sat Dec  5 09:22:32 UTC 2015 - mpluskal@suse.com
 
diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec
index 351ec25..c73d7bd 100644
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@ -19,7 +19,7 @@
 
 %global libmicrohttpd libmicrohttpd12
 Name:           libmicrohttpd
-Version:        0.9.47
+Version:        0.9.48
 Release:        0
 Summary:        Small Embeddable HTTP Server Library
 License:        LGPL-2.1+
@@ -41,6 +41,7 @@ BuildRequires:  libtool
 BuildRequires:  makeinfo
 BuildRequires:  openssl-devel
 BuildRequires:  pkg-config
+BuildRequires:  socat
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
diff --git a/libmicrohttpd_test_data.patch b/libmicrohttpd_test_data.patch
index 1c1f879..b3f6531 100644
--- a/libmicrohttpd_test_data.patch
+++ b/libmicrohttpd_test_data.patch
@@ -1,7 +1,7 @@
-Index: libmicrohttpd-0.9.42/src/testcurl/https/test_https_sni.c
+Index: libmicrohttpd-0.9.48/src/testcurl/https/test_https_sni.c
 ===================================================================
---- libmicrohttpd-0.9.42.orig/src/testcurl/https/test_https_sni.c
-+++ libmicrohttpd-0.9.42/src/testcurl/https/test_https_sni.c
+--- libmicrohttpd-0.9.48.orig/src/testcurl/https/test_https_sni.c
++++ libmicrohttpd-0.9.48/src/testcurl/https/test_https_sni.c
 @@ -186,7 +186,7 @@ do_get (const char *url)
    size_t len;
    struct curl_slist *dns_info;
@@ -20,10 +20,10 @@ Index: libmicrohttpd-0.9.42/src/testcurl/https/test_https_sni.c
      {
        fprintf (stderr, "Error: local file & received file differ.\n");
        free (cbc.buf);
-Index: libmicrohttpd-0.9.42/src/testcurl/https/tls_test_common.c
+Index: libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.c
 ===================================================================
---- libmicrohttpd-0.9.42.orig/src/testcurl/https/tls_test_common.c
-+++ libmicrohttpd-0.9.42/src/testcurl/https/tls_test_common.c
+--- libmicrohttpd-0.9.48.orig/src/testcurl/https/tls_test_common.c
++++ libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.c
 @@ -74,7 +74,7 @@ test_daemon_get (void *cls,
    char url[255];
    size_t len;
@@ -74,10 +74,10 @@ Index: libmicrohttpd-0.9.42/src/testcurl/https/tls_test_common.c
  		len) != 0) )
      {
        fprintf (stderr, "Error: local file & received file differ.\n");
-Index: libmicrohttpd-0.9.42/src/testcurl/https/tls_test_common.h
+Index: libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.h
 ===================================================================
---- libmicrohttpd-0.9.42.orig/src/testcurl/https/tls_test_common.h
-+++ libmicrohttpd-0.9.42/src/testcurl/https/tls_test_common.h
+--- libmicrohttpd-0.9.48.orig/src/testcurl/https/tls_test_common.h
++++ libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.h
 @@ -34,7 +34,7 @@
  
  #define DEAMON_TEST_PORT 4233