diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -1,69 +1,49 @@
-libmicrohttpd.so.10:MHD_add_connection
-libmicrohttpd.so.10:MHD_add_response_footer
-libmicrohttpd.so.10:MHD_add_response_header
-libmicrohttpd.so.10:MHD_basic_auth_get_username_password
-libmicrohttpd.so.10:MHD_create_post_processor
-libmicrohttpd.so.10:MHD_create_response_from_buffer
-libmicrohttpd.so.10:MHD_create_response_from_callback
-libmicrohttpd.so.10:MHD_create_response_from_data
-libmicrohttpd.so.10:MHD_create_response_from_fd
-libmicrohttpd.so.10:MHD_create_response_from_fd_at_offset
-libmicrohttpd.so.10:MHD_del_response_header
-libmicrohttpd.so.10:MHD_destroy_post_processor
-libmicrohttpd.so.10:MHD_destroy_response
-libmicrohttpd.so.10:MHD_digest_auth_check
-libmicrohttpd.so.10:MHD_digest_auth_get_username
-libmicrohttpd.so.10:MHD_get_connection_info
-libmicrohttpd.so.10:MHD_get_connection_values
-libmicrohttpd.so.10:MHD_get_daemon_info
-libmicrohttpd.so.10:MHD_get_fdset
-libmicrohttpd.so.10:MHD_get_fdset2
-libmicrohttpd.so.10:MHD_get_response_header
-libmicrohttpd.so.10:MHD_get_response_headers
-libmicrohttpd.so.10:MHD_get_timeout
-libmicrohttpd.so.10:MHD_get_version
-libmicrohttpd.so.10:MHD_http_unescape
-libmicrohttpd.so.10:MHD_is_feature_supported
-libmicrohttpd.so.10:MHD_lookup_connection_value
-libmicrohttpd.so.10:MHD_post_process
-libmicrohttpd.so.10:MHD_queue_auth_fail_response
-libmicrohttpd.so.10:MHD_queue_basic_auth_fail_response
-libmicrohttpd.so.10:MHD_queue_response
-libmicrohttpd.so.10:MHD_quiesce_daemon
-libmicrohttpd.so.10:MHD_resume_connection
-libmicrohttpd.so.10:MHD_run
-libmicrohttpd.so.10:MHD_run_from_select
-libmicrohttpd.so.10:MHD_set_connection_option
-libmicrohttpd.so.10:MHD_set_connection_value
-libmicrohttpd.so.10:MHD_set_panic_func
-libmicrohttpd.so.10:MHD_set_response_options
-libmicrohttpd.so.10:MHD_start_daemon
-libmicrohttpd.so.10:MHD_start_daemon_va
-libmicrohttpd.so.10:MHD_stop_daemon
-libmicrohttpd.so.10:MHD_suspend_connection
-libmicrospdy.so.0:SPDYF_name_value_from_stream
-libmicrospdy.so.0:SPDYF_name_value_to_stream
-libmicrospdy.so.0:SPDY_build_response
-libmicrospdy.so.0:SPDY_build_response_with_callback
-libmicrospdy.so.0:SPDY_deinit
-libmicrospdy.so.0:SPDY_destroy_request
-libmicrospdy.so.0:SPDY_destroy_response
-libmicrospdy.so.0:SPDY_get_cls_from_request
-libmicrospdy.so.0:SPDY_get_cls_from_session
-libmicrospdy.so.0:SPDY_get_fdset
-libmicrospdy.so.0:SPDY_get_remote_addr
-libmicrospdy.so.0:SPDY_get_session_for_request
-libmicrospdy.so.0:SPDY_get_timeout
-libmicrospdy.so.0:SPDY_init
-libmicrospdy.so.0:SPDY_name_value_add
-libmicrospdy.so.0:SPDY_name_value_create
-libmicrospdy.so.0:SPDY_name_value_destroy
-libmicrospdy.so.0:SPDY_name_value_iterate
-libmicrospdy.so.0:SPDY_name_value_lookup
-libmicrospdy.so.0:SPDY_queue_response
-libmicrospdy.so.0:SPDY_run
-libmicrospdy.so.0:SPDY_set_cls_to_request
-libmicrospdy.so.0:SPDY_set_cls_to_session
-libmicrospdy.so.0:SPDY_set_panic_func
-libmicrospdy.so.0:SPDY_start_daemon
-libmicrospdy.so.0:SPDY_stop_daemon
+libmicrohttpd.so.12:MHD_add_connection
+libmicrohttpd.so.12:MHD_add_response_footer
+libmicrohttpd.so.12:MHD_add_response_header
+libmicrohttpd.so.12:MHD_basic_auth_get_username_password
+libmicrohttpd.so.12:MHD_create_post_processor
+libmicrohttpd.so.12:MHD_create_response_for_upgrade
+libmicrohttpd.so.12:MHD_create_response_from_buffer
+libmicrohttpd.so.12:MHD_create_response_from_callback
+libmicrohttpd.so.12:MHD_create_response_from_data
+libmicrohttpd.so.12:MHD_create_response_from_fd
+libmicrohttpd.so.12:MHD_create_response_from_fd64
+libmicrohttpd.so.12:MHD_create_response_from_fd_at_offset
+libmicrohttpd.so.12:MHD_create_response_from_fd_at_offset64
+libmicrohttpd.so.12:MHD_del_response_header
+libmicrohttpd.so.12:MHD_destroy_post_processor
+libmicrohttpd.so.12:MHD_destroy_response
+libmicrohttpd.so.12:MHD_digest_auth_check
+libmicrohttpd.so.12:MHD_digest_auth_get_username
+libmicrohttpd.so.12:MHD_free
+libmicrohttpd.so.12:MHD_get_connection_info
+libmicrohttpd.so.12:MHD_get_connection_values
+libmicrohttpd.so.12:MHD_get_daemon_info
+libmicrohttpd.so.12:MHD_get_fdset
+libmicrohttpd.so.12:MHD_get_fdset2
+libmicrohttpd.so.12:MHD_get_reason_phrase_for
+libmicrohttpd.so.12:MHD_get_response_header
+libmicrohttpd.so.12:MHD_get_response_headers
+libmicrohttpd.so.12:MHD_get_timeout
+libmicrohttpd.so.12:MHD_get_version
+libmicrohttpd.so.12:MHD_http_unescape
+libmicrohttpd.so.12:MHD_is_feature_supported
+libmicrohttpd.so.12:MHD_lookup_connection_value
+libmicrohttpd.so.12:MHD_post_process
+libmicrohttpd.so.12:MHD_queue_auth_fail_response
+libmicrohttpd.so.12:MHD_queue_basic_auth_fail_response
+libmicrohttpd.so.12:MHD_queue_response
+libmicrohttpd.so.12:MHD_quiesce_daemon
+libmicrohttpd.so.12:MHD_resume_connection
+libmicrohttpd.so.12:MHD_run
+libmicrohttpd.so.12:MHD_run_from_select
+libmicrohttpd.so.12:MHD_set_connection_option
+libmicrohttpd.so.12:MHD_set_connection_value
+libmicrohttpd.so.12:MHD_set_panic_func
+libmicrohttpd.so.12:MHD_set_response_options
+libmicrohttpd.so.12:MHD_start_daemon
+libmicrohttpd.so.12:MHD_start_daemon_va
+libmicrohttpd.so.12:MHD_stop_daemon
+libmicrohttpd.so.12:MHD_suspend_connection
+libmicrohttpd.so.12:MHD_upgrade_action
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,7 +1,3 @@
 libc.so.6
-libcurl.so.4
-libgcrypt.so.20
 libgnutls.so.30
 libpthread.so.0
-libssl.so.1.0.0
-libz.so.1
diff --git a/component.xml b/component.xml
deleted file mode 100644
--- a/component.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<PISI>
-    <Name>network.web</Name>
-</PISI>
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,13 +1,15 @@
 name       : libmicrohttpd
-version    : 0.9.42
-release    : 4
+version    : 0.9.58
+release    : 6
 source     :
-    - http://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-0.9.42.tar.gz : 00352073367003da40607319e4090a6a8308748b59246ae80e9871f34dad7d5b
+    - https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.58.tar.gz : 7a11e1376c62ff95bd6d2dfe6799d57ac7cdbcb32f70bfbd5e47c71f373e01f3
 license    : LGPL-2.1
+component  : network.web
 summary    : GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application.
 description: |
     GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application.
 builddeps  :
+    - pkgconfig(libcurl) # extended checks
     - pkgconfig(gnutls)
 setup      : |
     %configure --disable-static
@@ -15,3 +17,5 @@
     %make
 install    : |
     %make_install
+check      : |
+    %make check
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,50 +2,50 @@
     <Source>
         <Name>libmicrohttpd</Name>
         <Packager>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Packager>
         <License>LGPL-2.1</License>
+        <PartOf>network.web</PartOf>
         <Summary xml:lang="en">GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application.</Summary>
         <Description xml:lang="en">GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application.
 </Description>
         <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
     </Source>
     <Package>
-        <Name>libmicrohttpd-devel</Name>
-        <Summary xml:lang="en">Development files for libmicrohttpd</Summary>
+        <Name>libmicrohttpd</Name>
+        <Summary xml:lang="en">GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application.</Summary>
         <Description xml:lang="en">GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application.
 </Description>
-        <PartOf>programming.devel</PartOf>
-        <RuntimeDependencies>
-            <Dependency release="current">libmicrohttpd</Dependency>
-        </RuntimeDependencies>
+        <PartOf>network.web</PartOf>
         <Files>
-            <Path fileType="header">/usr/include</Path>
-            <Path fileType="library">/usr/lib64/lib*.so</Path>
-            <Path fileType="data">/usr/lib64/pkgconfig</Path>
-            <Path fileType="man">/usr/share/man/man3</Path>
+            <Path fileType="library">/usr/lib64/lib*.so.*</Path>
+            <Path fileType="info">/usr/share/info</Path>
+            <Path fileType="man">/usr/share/man</Path>
         </Files>
     </Package>
     <Package>
-        <Name>libmicrohttpd</Name>
-        <Summary xml:lang="en">GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application.</Summary>
+        <Name>libmicrohttpd-devel</Name>
+        <Summary xml:lang="en">Development files for libmicrohttpd</Summary>
         <Description xml:lang="en">GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application.
 </Description>
-        <PartOf>network.web</PartOf>
+        <PartOf>programming.devel</PartOf>
+        <RuntimeDependencies>
+            <Dependency release="6">libmicrohttpd</Dependency>
+        </RuntimeDependencies>
         <Files>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib64/lib*.so.*</Path>
-            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="header">/usr/include/</Path>
+            <Path fileType="library">/usr/lib64/lib*.so</Path>
+            <Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
         </Files>
     </Package>
     <History>
-        <Update release="4">
-            <Date>2016-03-08</Date>
-            <Version>0.9.42</Version>
+        <Update release="6">
+            <Date>2017-12-08</Date>
+            <Version>0.9.58</Version>
             <Comment>Packaging update</Comment>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file