diff --git a/src/apps/httpd/httpd.c b/src/apps/httpd/httpd.c
index 18d4adbf..8bed6a1c 100644
--- a/src/apps/httpd/httpd.c
+++ b/src/apps/httpd/httpd.c
@@ -2619,13 +2619,11 @@ httpd_init(void)
   struct tcp_pcb *pcb;
   err_t err;
 
-#if MEMP_MEM_MALLOC || MEM_USE_POOLS || MEMP_USE_CUSTOM_POOLS
 #if HTTPD_USE_MEM_POOL
   LWIP_MEMPOOL_INIT(HTTPD_STATE);
 #if LWIP_HTTPD_SSI
   LWIP_MEMPOOL_INIT(HTTPD_SSI_STATE);
 #endif
-#endif
 #endif
   LWIP_DEBUGF(HTTPD_DEBUG, ("httpd_init\n"));
 
diff --git a/src/include/lwip/apps/httpd.h b/src/include/lwip/apps/httpd.h
index 04c0679c..40f1811e 100644
--- a/src/include/lwip/apps/httpd.h
+++ b/src/include/lwip/apps/httpd.h
@@ -165,7 +165,7 @@ typedef u16_t (*tSSIHandler)(
 void http_set_ssi_handler(tSSIHandler pfnSSIHandler,
                           const char **ppcTags, int iNumTags);
 
-/** For LWIP_HTTPD_SSI_RAW==1, return this to indicat the tag is unknown.
+/** For LWIP_HTTPD_SSI_RAW==1, return this to indicate the tag is unknown.
  * In this case, the webserver writes a warning into the page.
  * You can also just return 0 to write nothing for unknown tags.
  */
diff --git a/src/include/lwip/apps/httpd_opts.h b/src/include/lwip/apps/httpd_opts.h
index 148a406e..11109b96 100644
--- a/src/include/lwip/apps/httpd_opts.h
+++ b/src/include/lwip/apps/httpd_opts.h
@@ -58,6 +58,12 @@
 #define LWIP_HTTPD_SSI            0
 #endif
 
+/** Set this to 1 to implement an SSI tag handler callback that gets a const char*
+ * to the tag (instead of an index into a pre-registered array of known tags) */
+#ifndef LWIP_HTTPD_SSI_RAW
+#define LWIP_HTTPD_SSI_RAW        0
+#endif
+
 /** Set this to 1 to support HTTP POST */
 #ifndef LWIP_HTTPD_SUPPORT_POST
 #define LWIP_HTTPD_SUPPORT_POST   0