diff --git a/Makefile b/Makefile
index 87bee83c..a5c25cad 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ mg_prefix: mongoose.c mongoose.h
 	$(CLANG) mongoose.c $(CFLAGS) -c -o /tmp/x.o && nm /tmp/x.o | grep ' T' | grep -v 'mg_' ; test $$? = 1
 
 # C++ build
-test++: CLANG = g++ -Wno-deprecated -Wno-missing-field-initializers -Wno-error=format-truncation -Wno-unknown-warning-option
+test++: CLANG = g++ -Wno-deprecated -Wno-missing-field-initializers
 test++: unamalgamated
 
 # Make sure we can build from an unamalgamated sources
@@ -92,7 +92,7 @@ linux: Makefile mongoose.c mongoose.h test/unit_test.c
 	$(GCC) $(CC) mongoose.c test/unit_test.c $(CFLAGS) $(LDFLAGS) -o unit_test_gcc
 	$(GCC) ./unit_test_gcc
 
-linux++: CC = g++ -Wno-missing-field-initializers -Wno-error=format-truncation
+linux++: CC = g++ -Wno-missing-field-initializers
 linux++: linux
 
 mongoose.c: $(SRCS) Makefile
diff --git a/mongoose.c b/mongoose.c
index 76d14b10..6093b3d3 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -3260,7 +3260,8 @@ static char *mg_ssi(const char *path, const char *root, int depth) {
       if (intag && ch == '>' && buf[len - 1] == '-' && buf[len - 2] == '-') {
         buf[len++] = ch & 0xff;
         if (sscanf(buf, "<!--#include file=\"%[^\"]", arg)) {
-          char tmp[MG_PATH_MAX], *p = (char *) path + strlen(path), *data;
+          char tmp[MG_PATH_MAX + BUFSIZ + 10],
+              *p = (char *) path + strlen(path), *data;
           while (p > path && p[-1] != MG_DIRSEP && p[-1] != '/') p--;
           snprintf(tmp, sizeof(tmp), "%.*s%s", (int) (p - path), path, arg);
           if (depth < MG_MAX_SSI_DEPTH &&
@@ -3271,7 +3272,7 @@ static char *mg_ssi(const char *path, const char *root, int depth) {
             LOG(LL_ERROR, ("%s: file=%s error or too deep", path, arg));
           }
         } else if (sscanf(buf, "<!--#include virtual=\"%[^\"]", arg)) {
-          char tmp[MG_PATH_MAX], *data;
+          char tmp[MG_PATH_MAX + BUFSIZ + 10], *data;
           snprintf(tmp, sizeof(tmp), "%s%s", root, arg);
           if (depth < MG_MAX_SSI_DEPTH &&
               (data = mg_ssi(tmp, root, depth + 1)) != NULL) {
diff --git a/src/ssi.c b/src/ssi.c
index b862afa8..8ddba017 100644
--- a/src/ssi.c
+++ b/src/ssi.c
@@ -18,7 +18,8 @@ static char *mg_ssi(const char *path, const char *root, int depth) {
       if (intag && ch == '>' && buf[len - 1] == '-' && buf[len - 2] == '-') {
         buf[len++] = ch & 0xff;
         if (sscanf(buf, "<!--#include file=\"%[^\"]", arg)) {
-          char tmp[MG_PATH_MAX], *p = (char *) path + strlen(path), *data;
+          char tmp[MG_PATH_MAX + BUFSIZ + 10],
+              *p = (char *) path + strlen(path), *data;
           while (p > path && p[-1] != MG_DIRSEP && p[-1] != '/') p--;
           snprintf(tmp, sizeof(tmp), "%.*s%s", (int) (p - path), path, arg);
           if (depth < MG_MAX_SSI_DEPTH &&
@@ -29,7 +30,7 @@ static char *mg_ssi(const char *path, const char *root, int depth) {
             LOG(LL_ERROR, ("%s: file=%s error or too deep", path, arg));
           }
         } else if (sscanf(buf, "<!--#include virtual=\"%[^\"]", arg)) {
-          char tmp[MG_PATH_MAX], *data;
+          char tmp[MG_PATH_MAX + BUFSIZ + 10], *data;
           snprintf(tmp, sizeof(tmp), "%s%s", root, arg);
           if (depth < MG_MAX_SSI_DEPTH &&
               (data = mg_ssi(tmp, root, depth + 1)) != NULL) {