diff --git a/docs/src/docbkx/reference/samples.xml b/docs/src/docbkx/reference/samples.xml
index af75f74a..b24bb7d3 100644
--- a/docs/src/docbkx/reference/samples.xml
+++ b/docs/src/docbkx/reference/samples.xml
@@ -26,6 +26,14 @@
     exits. Multiple instances can be started at the same time as they will
     work with each other sharing data without any user intervention.</para>
 
+    <note>
+      <title>Running under Linux</title>
+      <para>If you experience networking problems when starting GemFire or the samples,
+      try adding the following system property <literal>java.net.preferIPv4Stack=true</literal>
+      to the command line (insert <literal>-Djava.net.preferIPv4Stack=true</literal>).
+      For an alternative (global) fix especially on Ubuntu see
+      this <ulink url="https://jira.springsource.org/browse/SGF-28">link</ulink></para>
+    </note>
     <section id="samples:hello-world:start-stop">
       <title>Starting and stopping the sample</title>
 
diff --git a/docs/src/main/resources/changelog.txt b/docs/src/main/resources/changelog.txt
index a567be62..ba844545 100644
--- a/docs/src/main/resources/changelog.txt
+++ b/docs/src/main/resources/changelog.txt
@@ -6,6 +6,7 @@ Changes in version 1.0.1 (2011-mm-dd)
 -------------------------------------
 General
 * Upgraded to GemFire 6.5.1.2
+* Fix networking issue with the sample on some Linux distributions (Ubuntu)
 
 Package org.springframework.data.gemfire
 * Introduced auto-close (configurable) on RegionFactoryBean