diff --git a/docs/changes.txt b/docs/changes.txt
index 6375693831..fd705b012f 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -91,6 +91,10 @@ Major new features in 2.8 release
 2.8.3
 -----
 
+All:
+
+- Shut down the sockets gracefully (Sergio Aguayo)
+
 wxMac
 
 - Corrected top border size for wxStaticBox with empty label (nusi).
diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp
index ed1ff5833b..62f3bfb076 100644
--- a/src/msw/gsocket.cpp
+++ b/src/msw/gsocket.cpp
@@ -222,7 +222,7 @@ void GSocket::Shutdown()
   /* If socket has been created, shutdown it */
   if (m_fd != INVALID_SOCKET)
   {
-    shutdown(m_fd, 2);
+    shutdown(m_fd, 1 /* SD_SEND */);
     Close();
   }
 
diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 6e0292a78b..eeee3fa8cc 100644
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -587,7 +587,7 @@ void GSocket::Shutdown()
   /* If socket has been created, shutdown it */
   if (m_fd != INVALID_SOCKET)
   {
-    shutdown(m_fd, 2);
+    shutdown(m_fd, 1);
     Close();
   }