diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 8c008c493e7e..2fe8879b93de 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,27 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 5.10.4.1</title>
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    When using gen_tcp:connect and the <c>fd</c> option with
+	    <c>port</c> and/or <c>ip</c>, the <c>port</c> and
+	    <c>ip</c> options were ignored. This has been fixed so
+	    that if <c>port</c> and/or <c>ip</c> is specified
+	    together with <c>fd</c> a bind is requested for that
+	    <c>fd</c>. If <c>port</c> and/or <c>ip</c> is not
+	    specified bind will not be called.</p>
+          <p>
+	    Own Id: OTP-12061</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.10.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index b2e89ea85082..1e8ab3f14b82 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -30,6 +30,27 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 2.16.4.1</title>
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    When using gen_tcp:connect and the <c>fd</c> option with
+	    <c>port</c> and/or <c>ip</c>, the <c>port</c> and
+	    <c>ip</c> options were ignored. This has been fixed so
+	    that if <c>port</c> and/or <c>ip</c> is specified
+	    together with <c>fd</c> a bind is requested for that
+	    <c>fd</c>. If <c>port</c> and/or <c>ip</c> is not
+	    specified bind will not be called.</p>
+          <p>
+	    Own Id: OTP-12061</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 2.16.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>