diff --git a/libmicrohttpd-0.9.39.tar.gz b/libmicrohttpd-0.9.39.tar.gz
deleted file mode 100644
index e29bad1..0000000
--- a/libmicrohttpd-0.9.39.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f937b6065c366d776be86b1d24b8fc400ebc7ea006a9d77c49a8f2f0cd7e373
-size 1205722
diff --git a/libmicrohttpd-0.9.39.tar.gz.sig b/libmicrohttpd-0.9.39.tar.gz.sig
deleted file mode 100644
index ba12108..0000000
Binary files a/libmicrohttpd-0.9.39.tar.gz.sig and /dev/null differ
diff --git a/libmicrohttpd-0.9.40.tar.gz b/libmicrohttpd-0.9.40.tar.gz
new file mode 100644
index 0000000..ec9c104
--- /dev/null
+++ b/libmicrohttpd-0.9.40.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:403d4d46a8690ad8382bd9f156be3eaf4e80869a75b39f03d48bbcb124c7b7a6
+size 1222222
diff --git a/libmicrohttpd-0.9.40.tar.gz.sig b/libmicrohttpd-0.9.40.tar.gz.sig
new file mode 100644
index 0000000..00f2c1e
Binary files /dev/null and b/libmicrohttpd-0.9.40.tar.gz.sig differ
diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes
index 2911850..3555f7f 100644
--- a/libmicrohttpd.changes
+++ b/libmicrohttpd.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Mon Apr 13 11:39:23 UTC 2015 - meissner@suse.com
+
+- updated to 0.9.40
+  - Fix potential deadlock issue in MHD_USE_THREAD_PER_CONNECTION
+    mode if shutdown is initiated while connections are active. -CG
+
+  - Fix issue in thread-pool mode where a MHD_stop_daemon()
+    might not reach threads that stopped listening because
+    we hit the maximum number of concurrent connections and
+    the option MHD_USE_PIPE_FOR_SHUTDOWN was also not used.
+    Testcase added as well. -CG
+
+  - Update HTTPS testcases to avoid SSLv3, as SSLv3 is dead.
+
+  - Do not enforce FD_SETSIZE-limit on worker control
+    pipe when using MHD_USE_EPOLL_LINUX_ONLY (#3751). -MH/CG
+
+  - Adding MHD_OPTION_NOTIFY_CONNECTION,
+    MHD_CONNECTION_NOTIFY_STARTED,
+    MHD_CONNECTION_NOTIFY_CLOSED and
+    MHD_CONNECTION_INFO_SOCKET_CONTEXT to allow
+    applications to trigger operations when TCP
+    connections start or end, instead of just
+    exposing HTTP requests starting and ending. -RG/CG
+
+  - Fixing bug that prevented MHD_OPTION_HTTPS_MEM_DHPARAMS
+    from working within a MHD_OPTION_ARRAY. -DD
+
+  - Adding MHD_OPTION_HTTPS_KEY_PASSWORD as proposed by
+    Andrew Basile. -CG/AB
+
+  - Fix issue where for HTTP/1.0-clients that set
+    Connection: Keep-Alive header a response of
+    indefinite size was generated with chunked encoding. -CG
+
+  - Fix potential infinite loop on shutdown in multi-threaded mode
+    under certain conditions. -CG
+- fixed info deinstall
+
 -------------------------------------------------------------------
 Thu Jan  8 08:48:47 UTC 2015 - meissner@suse.com
 
diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec
index bc8e559..737b24d 100644
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libmicrohttpd
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010,2011,2012  Stephan Kleine
 #
 # All modifications and additions to the file contributed by third parties
@@ -20,7 +20,7 @@
 %global libmicrohttpd libmicrohttpd10
 %global libmicrospdy  libmicrospdy0
 Name:           libmicrohttpd
-Version:        0.9.39
+Version:        0.9.40
 Release:        0
 Summary:        Small Embeddable HTTP Server Library
 License:        LGPL-2.1+
@@ -94,7 +94,7 @@ Summary:        Small Embeddable HTTP Server Library
 Group:          Development/Libraries/C and C++
 Requires:       %{libmicrohttpd} = %{version}
 Requires(post): info
-Requires(postun): info
+Requires(preun): info
 
 %description devel
 Headers, pkg-config files, so link and other development files for %{name}
@@ -140,7 +140,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
-make -d -j1 check
+make -j1 check
 
 %post -n %{libmicrohttpd} -p /sbin/ldconfig
 
@@ -151,11 +151,10 @@ make -d -j1 check
 %postun -n %{libmicrospdy} -p /sbin/ldconfig
 
 %post devel
-
 %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info}
 %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info}
 
-%postun devel
+%preun devel
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info}
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info}