30 files changed, 2 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index bce8ee96..b222b67b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -449,7 +449,7 @@ m4/Makefile
 src/Makefile
 src/include/Makefile
 src/include/plibc/Makefile
-src/daemon/Makefile
+src/microhttpd/Makefile
 src/examples/Makefile
 src/testcurl/Makefile
 src/testcurl/https/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 4868557b..79b19bf5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,4 +6,4 @@ zzuftests = testzzuf
 endif
 endif
 endif
-SUBDIRS = include daemon examples $(curltests) $(zzuftests) . 
+SUBDIRS = include microhttpd examples $(curltests) $(zzuftests) . 
diff --git a/src/daemon/EXPORT.sym b/src/microhttpd/EXPORT.sym
index dc32b6d3..dc32b6d3 100644
--- a/src/daemon/EXPORT.sym
+++ b/src/microhttpd/EXPORT.sym
diff --git a/src/daemon/Makefile.am b/src/microhttpd/Makefile.am
index bb9dead6..bb9dead6 100644
--- a/src/daemon/Makefile.am
+++ b/src/microhttpd/Makefile.am
diff --git a/src/daemon/base64.c b/src/microhttpd/base64.c
index d14317b3..d14317b3 100644
--- a/src/daemon/base64.c
+++ b/src/microhttpd/base64.c
diff --git a/src/daemon/base64.h b/src/microhttpd/base64.h
index 831adf97..831adf97 100644
--- a/src/daemon/base64.h
+++ b/src/microhttpd/base64.h
diff --git a/src/daemon/basicauth.c b/src/microhttpd/basicauth.c
index e8a69e7d..e8a69e7d 100644
--- a/src/daemon/basicauth.c
+++ b/src/microhttpd/basicauth.c
diff --git a/src/daemon/connection.c b/src/microhttpd/connection.c
index 728da12d..728da12d 100644
--- a/src/daemon/connection.c
+++ b/src/microhttpd/connection.c
diff --git a/src/daemon/connection.h b/src/microhttpd/connection.h
index e639691f..e639691f 100644
--- a/src/daemon/connection.h
+++ b/src/microhttpd/connection.h
diff --git a/src/daemon/connection_https.c b/src/microhttpd/connection_https.c
index b0be3ced..b0be3ced 100644
--- a/src/daemon/connection_https.c
+++ b/src/microhttpd/connection_https.c
diff --git a/src/daemon/connection_https.h b/src/microhttpd/connection_https.h
index 8a5cf380..8a5cf380 100644
--- a/src/daemon/connection_https.h
+++ b/src/microhttpd/connection_https.h
diff --git a/src/daemon/daemon.c b/src/microhttpd/daemon.c
index ef69d14b..ef69d14b 100644
--- a/src/daemon/daemon.c
+++ b/src/microhttpd/daemon.c
diff --git a/src/daemon/digestauth.c b/src/microhttpd/digestauth.c
index d6c26114..d6c26114 100644
--- a/src/daemon/digestauth.c
+++ b/src/microhttpd/digestauth.c
diff --git a/src/daemon/internal.c b/src/microhttpd/internal.c
index 1730c0c9..1730c0c9 100644
--- a/src/daemon/internal.c
+++ b/src/microhttpd/internal.c
diff --git a/src/daemon/internal.h b/src/microhttpd/internal.h
index f76d6834..f76d6834 100644
--- a/src/daemon/internal.h
+++ b/src/microhttpd/internal.h
diff --git a/src/daemon/md5.c b/src/microhttpd/md5.c
index 5daa0334..5daa0334 100644
--- a/src/daemon/md5.c
+++ b/src/microhttpd/md5.c
diff --git a/src/daemon/md5.h b/src/microhttpd/md5.h
index 15d620d7..15d620d7 100644
--- a/src/daemon/md5.h
+++ b/src/microhttpd/md5.h
diff --git a/src/daemon/memorypool.c b/src/microhttpd/memorypool.c
index bd7c0c3a..bd7c0c3a 100644
--- a/src/daemon/memorypool.c
+++ b/src/microhttpd/memorypool.c
diff --git a/src/daemon/memorypool.h b/src/microhttpd/memorypool.h
index 8187a91d..8187a91d 100644
--- a/src/daemon/memorypool.h
+++ b/src/microhttpd/memorypool.h
diff --git a/src/daemon/postprocessor.c b/src/microhttpd/postprocessor.c
index 6cd6d82d..6cd6d82d 100644
--- a/src/daemon/postprocessor.c
+++ b/src/microhttpd/postprocessor.c
diff --git a/src/daemon/reason_phrase.c b/src/microhttpd/reason_phrase.c
index 843f47a9..843f47a9 100644
--- a/src/daemon/reason_phrase.c
+++ b/src/microhttpd/reason_phrase.c
diff --git a/src/daemon/reason_phrase.h b/src/microhttpd/reason_phrase.h
index 20c11d52..20c11d52 100644
--- a/src/daemon/reason_phrase.h
+++ b/src/microhttpd/reason_phrase.h
diff --git a/src/daemon/response.c b/src/microhttpd/response.c
index 5db03824..5db03824 100644
--- a/src/daemon/response.c
+++ b/src/microhttpd/response.c
diff --git a/src/daemon/response.h b/src/microhttpd/response.h
index ec1b3878..ec1b3878 100644
--- a/src/daemon/response.h
+++ b/src/microhttpd/response.h
diff --git a/src/daemon/test_daemon.c b/src/microhttpd/test_daemon.c
index 4140fb4f..4140fb4f 100644
--- a/src/daemon/test_daemon.c
+++ b/src/microhttpd/test_daemon.c
diff --git a/src/daemon/test_postprocessor.c b/src/microhttpd/test_postprocessor.c
index eb412b72..eb412b72 100644
--- a/src/daemon/test_postprocessor.c
+++ b/src/microhttpd/test_postprocessor.c
diff --git a/src/daemon/test_postprocessor_amp.c b/src/microhttpd/test_postprocessor_amp.c
index 73f72f92..73f72f92 100644
--- a/src/daemon/test_postprocessor_amp.c
+++ b/src/microhttpd/test_postprocessor_amp.c
diff --git a/src/daemon/test_postprocessor_large.c b/src/microhttpd/test_postprocessor_large.c
index 2af84dcc..2af84dcc 100644
--- a/src/daemon/test_postprocessor_large.c
+++ b/src/microhttpd/test_postprocessor_large.c
diff --git a/src/daemon/tsearch.c b/src/microhttpd/tsearch.c
index 2ab9a467..2ab9a467 100644
--- a/src/daemon/tsearch.c
+++ b/src/microhttpd/tsearch.c
diff --git a/src/daemon/tsearch.h b/src/microhttpd/tsearch.h
index 824f9a2d..824f9a2d 100644
--- a/src/daemon/tsearch.h
+++ b/src/microhttpd/tsearch.h