diff --git a/docs/changes.txt b/docs/changes.txt
index 4536cb44c2..9eecd92f15 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -577,6 +577,10 @@ Major new features in this release
 3.0.3: (released 2015-??-??)
 ----------------------------
 
+Unix:
+
+- Fix wxIPaddress::Hostname() failing if /etc/hosts contained very long names.
+
 All (GUI):
 
 - Fix several floating point rounding bugs in wxPropertyGrid (Artur Wieczorek).
diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index f2adc5634e..a7edf6bd1e 100644
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -136,7 +136,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
         }
     };
 #else
-    typedef char wxGethostBuf[1024];
+    typedef char wxGethostBuf[4096];
 #endif
 
 #ifdef HAVE_FUNC_GETSERVBYNAME_R_4
@@ -148,7 +148,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
         }
     };
 #else
-    typedef char wxGetservBuf[1024];
+    typedef char wxGetservBuf[4096];
 #endif
 
 #if defined(wxHAS_MT_SAFE_GETBY_FUNCS) || !wxUSE_THREADS