diff --git a/ChangeLog b/ChangeLog
index 159fbc4abe3..4c64225cde3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7392,3 +7392,11 @@
 	  net/net_arptimer to arp/arp_timer.c. (2014-5-30).
 	* net/igmp:  Moved IGMP files from net/uip to net/igmp (2014-5-30).
 	* net/icmp:  Moved ICMP files from net/uip to net/icmp (2014-5-30).
+	* net/uip/uip_tcptimer.c:  NET: Notify upper layer when TIME_WAIT or
+	  FIN_WAIT_2 timeout occurs. Otherwise connections possibly won't get
+	  freed. From Max Holtzberg (2014-6-2).
+	* TCP fallback allocation: Added all states in which the connections are
+	  about to be closed.  Fallback mechanism is disabled when SO_LINGER is
+	  enabled to prevent deadlocks in netclos_disconnect().  From Max Holtzberg
+	  (2014-6-2).
+
diff --git a/configs/16z/src/z16f_lowinit.c b/configs/16z/src/z16f_lowinit.c
index 7e2c64928bd..a9198011883 100644
--- a/configs/16z/src/z16f_lowinit.c
+++ b/configs/16z/src/z16f_lowinit.c
@@ -61,7 +61,7 @@ static void z16f_extcsinit(void)
    * Post Read: No wait states; Chip select: 1 wait state
    */
 
-  putreg16(0x9001, Z16F_EXTCS0H);
+  putreg16(0x9001, Z16F_EXTCS0);
 
   /* CS1 enabled, Data [0:7]
    * Post Read: No wait states; Chip select: 1 wait state