diff --git a/ChangeLog b/ChangeLog
index 03f4d57d032..7760eecbfd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5785,4 +5785,7 @@
 	* include/nuttx/net/uip/uip-tcp.h, net/send.c, uip/uip_tcpconn.c, and
 	  uip/uip_tcpinput.c:  Change how the inital minimum MSS is calculated.
 	  Max Holtzberg (2013-10-17).
+	* net/uip/uip_tcpinput.c:  Move tcp connection into SYN_RCVD state
+	  after aception instead of bypassing and moving directly into ESTABLISHED.
+	  From Max Holtzber (2013-10-17).
 
diff --git a/net/uip/uip_tcpinput.c b/net/uip/uip_tcpinput.c
index 54965918c9d..815db412924 100644
--- a/net/uip/uip_tcpinput.c
+++ b/net/uip/uip_tcpinput.c
@@ -190,15 +190,6 @@ void uip_tcpinput(struct uip_driver_s *dev)
                   uip_tcpfree(conn);
                   conn = NULL;
                 }
-              else
-                {
-                  /* TCP state machine should move to the ESTABLISHED state only after
-                   * it has received ACK from the host.  This needs to be investigated
-                   * further.
-                   */
-
-                  conn->tcpstateflags = UIP_ESTABLISHED;
-                }
             }
 
           if (!conn)