diff --git a/src/apps/httpd/httpd.c b/src/apps/httpd/httpd.c
index 4b2007ba..10603a5b 100644
--- a/src/apps/httpd/httpd.c
+++ b/src/apps/httpd/httpd.c
@@ -79,6 +79,7 @@
  * about an unknown extension, make sure to add it (and its doctype) to
  * the 'g_psHTTPHeaders' list.
  */
+#include "lwip/init.h"
 #include "lwip/apps/httpd.h"
 #include "lwip/debug.h"
 #include "lwip/stats.h"
diff --git a/src/apps/httpd/makefsdata/makefsdata.c b/src/apps/httpd/makefsdata/makefsdata.c
index 1c4ba524..90a62862 100644
--- a/src/apps/httpd/makefsdata/makefsdata.c
+++ b/src/apps/httpd/makefsdata/makefsdata.c
@@ -108,6 +108,7 @@ int deflate_level = 10; /* default compression level, can be changed via command
 /* define this to get the header variables we use to build HTTP headers */
 #define LWIP_HTTPD_DYNAMIC_HEADERS 1
 #define LWIP_HTTPD_SSI             1
+#include "lwip/init.h"
 #include "../httpd_structs.h"
 #include "lwip/apps/fs.h"
 
diff --git a/src/include/lwip/apps/httpd_opts.h b/src/include/lwip/apps/httpd_opts.h
index e1e7c066..fd6b4145 100644
--- a/src/include/lwip/apps/httpd_opts.h
+++ b/src/include/lwip/apps/httpd_opts.h
@@ -87,7 +87,7 @@
 
 /** This string is passed in the HTTP header as "Server: " */
 #ifndef HTTPD_SERVER_AGENT
-#define HTTPD_SERVER_AGENT "lwIP/1.3.1 (http://savannah.nongnu.org/projects/lwip)"
+#define HTTPD_SERVER_AGENT "lwIP/"LWIP_VERSION_STRING" (http://savannah.nongnu.org/projects/lwip)"
 #endif
 
 /** Set this to 1 if you want to include code that creates HTTP headers