diff --git a/contrib/sockets/sockets.lisp b/contrib/sockets/sockets.lisp
index 140d7c4ac..362cbbfdc 100644
--- a/contrib/sockets/sockets.lisp
+++ b/contrib/sockets/sockets.lisp
@@ -42,6 +42,7 @@
  "#include <netdb.h>"
  "#include <string.h>"
  "#include <netinet/in.h>"
+ "#include <netinet/tcp.h>"
  "#include <errno.h>"
  "#include <fcntl.h>"
  "#include <stdio.h>"
@@ -1437,6 +1438,8 @@ GET-NAME-SERVICE-ERRNO")
 #-(or :sun4sol2 :linux :wsock :cygwin)
 (define-sockopt sockopt-reuse-port "SO_REUSEPORT" bool)
 
+(define-sockopt socket-tcp-nodelay "TCP_NODELAY" bool)
+
 ;; Add sockopts here as you need them...
 
 ;; Finished loading
diff --git a/src/CHANGELOG b/src/CHANGELOG
index a74cf5241..4f7b1bace 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -144,6 +144,8 @@ ECL 0.9k:
 
  - Support for large files in systems that implement fseeko().
 
+ - Added option TCP_NODELAY to the sockets package.
+
 * CLOS:
 
  - When caching generic function calls, ECL now uses a thread-local hash table