diff --git a/NEWS b/NEWS
index 73b8b098..5eb6fe0e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ NEWS
 - 1.4.32 -
   * Code cleanup with clang/sparse (fixes #2437, thx kibi)
   * Ignore EPIPE/ECONNRESET after SSL_shutdown
+  * Handle ENAMETOOLONG, return 404 Not Found (fixes #2396, thx dererkazo)
 
 - 1.4.31 - 2012-05-31
   * [ssl] fix segfault in counting renegotiations for openssl versions without TLSEXT/SNI (thx carpii for reporting)
diff --git a/src/response.c b/src/response.c
index e829cfd8..fd1ab195 100644
--- a/src/response.c
+++ b/src/response.c
@@ -611,6 +611,8 @@ handler_t http_response_prepare(server *srv, connection *con) {
 
 				buffer_reset(con->physical.path);
 				return HANDLER_FINISHED;
+			case ENAMETOOLONG:
+				/* file name to be read was too long. return 404 */
 			case ENOENT:
 				con->http_status = 404;