diff --git a/src/Filelists.mk b/src/Filelists.mk
index e180e2a1..2d3d2be7 100644
--- a/src/Filelists.mk
+++ b/src/Filelists.mk
@@ -154,11 +154,11 @@ SNMPFILES=$(LWIPDIR)/apps/snmp/snmp_asn1.c \
 	$(LWIPDIR)/apps/snmp/snmp_traps.c
 
 # HTTPDFILES: HTTP server
-HTTPDFILES=$(LWIPDIR)/apps/httpd/fs.c \
-	$(LWIPDIR)/apps/httpd/httpd.c
+HTTPDFILES=$(LWIPDIR)/apps/http/fs.c \
+	$(LWIPDIR)/apps/http/httpd.c
 
 # MAKEFSDATA: MAKEFSDATA HTTP server host utility
-MAKEFSDATAFILES=$(LWIPDIR)/apps/httpd/makefsdata/makefsdata.c
+MAKEFSDATAFILES=$(LWIPDIR)/apps/http/makefsdata/makefsdata.c
 
 # LWIPERFFILES: IPERF server
 LWIPERFFILES=$(LWIPDIR)/apps/lwiperf/lwiperf.c
diff --git a/src/apps/httpd/fs.c b/src/apps/http/fs.c
similarity index 100%
rename from src/apps/httpd/fs.c
rename to src/apps/http/fs.c
diff --git a/src/apps/httpd/fs/404.html b/src/apps/http/fs/404.html
similarity index 100%
rename from src/apps/httpd/fs/404.html
rename to src/apps/http/fs/404.html
diff --git a/src/apps/httpd/fs/img/sics.gif b/src/apps/http/fs/img/sics.gif
similarity index 100%
rename from src/apps/httpd/fs/img/sics.gif
rename to src/apps/http/fs/img/sics.gif
diff --git a/src/apps/httpd/fs/index.html b/src/apps/http/fs/index.html
similarity index 100%
rename from src/apps/httpd/fs/index.html
rename to src/apps/http/fs/index.html
diff --git a/src/apps/httpd/fsdata.c b/src/apps/http/fsdata.c
similarity index 100%
rename from src/apps/httpd/fsdata.c
rename to src/apps/http/fsdata.c
diff --git a/src/apps/httpd/fsdata.h b/src/apps/http/fsdata.h
similarity index 100%
rename from src/apps/httpd/fsdata.h
rename to src/apps/http/fsdata.h
diff --git a/src/apps/httpd/httpd.c b/src/apps/http/httpd.c
similarity index 100%
rename from src/apps/httpd/httpd.c
rename to src/apps/http/httpd.c
diff --git a/src/apps/httpd/httpd_structs.h b/src/apps/http/httpd_structs.h
similarity index 100%
rename from src/apps/httpd/httpd_structs.h
rename to src/apps/http/httpd_structs.h
diff --git a/src/apps/httpd/makefsdata/makefsdata b/src/apps/http/makefsdata/makefsdata
similarity index 100%
rename from src/apps/httpd/makefsdata/makefsdata
rename to src/apps/http/makefsdata/makefsdata
diff --git a/src/apps/httpd/makefsdata/makefsdata.c b/src/apps/http/makefsdata/makefsdata.c
similarity index 100%
rename from src/apps/httpd/makefsdata/makefsdata.c
rename to src/apps/http/makefsdata/makefsdata.c
diff --git a/src/apps/httpd/makefsdata/readme.txt b/src/apps/http/makefsdata/readme.txt
similarity index 100%
rename from src/apps/httpd/makefsdata/readme.txt
rename to src/apps/http/makefsdata/readme.txt
diff --git a/src/apps/httpd/makefsdata/tinydir.h b/src/apps/http/makefsdata/tinydir.h
similarity index 100%
rename from src/apps/httpd/makefsdata/tinydir.h
rename to src/apps/http/makefsdata/tinydir.h