diff --git a/Version b/Version
index 88b2ffc8542..e72f8a11fd0 100644
--- a/Version
+++ b/Version
@@ -1 +1 @@
-inet-1.99.3
+inet-1.99.4
diff --git a/WHATSNEW b/WHATSNEW
index bd5d50b03ba..6690b876307 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,10 @@
 Recent changes in the INET Framework
 ====================================
 
+INET-1.99.4 (March 20, 2012)
+----------------------------
+
+
 INET-1.99.3 (Feb 22, 2012)
 --------------------------
 
diff --git a/src/applications/pingapp/ChangeLog b/src/applications/pingapp/ChangeLog
index 1d6a01df88d..bccd3ba742a 100644
--- a/src/applications/pingapp/ChangeLog
+++ b/src/applications/pingapp/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-04  Zoltan Bojthe
+
+    Added PingTestApp for testing the connectedness of the network.
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2011-12-21  Andras Varga
diff --git a/src/base/ChangeLog b/src/base/ChangeLog
index 2b4ed6b3005..f5968100c1b 100644
--- a/src/base/ChangeLog
+++ b/src/base/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-01  Andras Varga
+
+    Added createNode(), createLink() factory methods to Toplogy class.
+
+2012-02-14  Tamas Borbely
+
+    Added "multicast route changed/added/deleted" notification constants 
+    to NotifierConsts.h
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2012-02-11 Rudolf Hornig
diff --git a/src/mobility/models/ChangeLog b/src/mobility/models/ChangeLog
index ac6af0c4877..91cb5f9c9b8 100644
--- a/src/mobility/models/ChangeLog
+++ b/src/mobility/models/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-19 Levente Meszaros
+
+    fixed infinite loop when nextChange is set to current simulation time
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2012-01-05  Zoltan Bojthe
diff --git a/src/networklayer/arp/ChangeLog b/src/networklayer/arp/ChangeLog
index 6f1d429dab8..a432fa3c2a7 100644
--- a/src/networklayer/arp/ChangeLog
+++ b/src/networklayer/arp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-09  Tamas Borbely
+
+    mapping an IPv4 multicast address to a multicast MAC address as specified 
+    in RFC112, section 6.4
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2011-12-15  Zoltan Bojthe
diff --git a/src/networklayer/autorouting/ipv4/ChangeLog b/src/networklayer/autorouting/ipv4/ChangeLog
index ce2e82c8077..d92534d7a88 100644
--- a/src/networklayer/autorouting/ipv4/ChangeLog
+++ b/src/networklayer/autorouting/ipv4/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-04  Levente Meszaros
+
+    Added IPv4Configurator, a new network configurator for IPv4
+
+    This is intended to replace both routing files (.irt/.mrt) and
+    specialized network configurators like FlatNetworkConfigurator,
+    and do much more.
+
+    Covers address assignment (manual, automatic), adding manual routes,
+    setting up static routing, optimizing the routing tables, etc.
+    Unlike FlatNetworkConfigurator, it will generate per-interface
+    addresses. Wireless networks are also supported.
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2012-01-19  Andras Varga
diff --git a/src/networklayer/bgpv4/ChangeLog b/src/networklayer/bgpv4/ChangeLog
index aa701e61041..3653d939f59 100644
--- a/src/networklayer/bgpv4/ChangeLog
+++ b/src/networklayer/bgpv4/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-01  Levente Meszaros
+
+    - gateway is now correcty set on routing entries.
+    - eliminated redundant nextHop field from routingtable entries
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2012-01-19  Andras Varga
diff --git a/src/networklayer/common/ChangeLog b/src/networklayer/common/ChangeLog
index 816087b7eb0..6efcc83a5cd 100644
--- a/src/networklayer/common/ChangeLog
+++ b/src/networklayer/common/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-04  Levente Meszaros
+
+   Added "displayAddresses" parameter to InterfaceTable. Setting it to true
+   will display all IP addresses on the connected links.
+
+2012-02-14  Tamas Borbely
+
+    Added getFirstMulticastInterface() to the InterfaceTable
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2012-01-31  Andras Varga
diff --git a/src/networklayer/contract/ChangeLog b/src/networklayer/contract/ChangeLog
index b346bd7fd5c..78cad402439 100644
--- a/src/networklayer/contract/ChangeLog
+++ b/src/networklayer/contract/ChangeLog
@@ -1,3 +1,19 @@
+2012-03-04  Zoltan Bojthe
+
+    IPvXAddressResolver::tryResolve() uses a new syntax:
+    host
+    host(protocol)
+    host%interfacename
+    host%interfacename(protocol)
+    host>destmodule
+    host>destmodule(protocol)
+    address: host [ { '%' interfacename | '>' destmodule } ] [ '(' protocol ')' ]    
+    protocol: { 'ipv4' | 'ipv6' | 'routerId' }
+
+2012-02-28  Andras Varga
+
+    'const char*' ctors of IPv4Address/IPv6Address/MACAddress made explicit
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2012-02-10  Rudolf Hornig
diff --git a/src/networklayer/ipv4/ChangeLog b/src/networklayer/ipv4/ChangeLog
index fde4cbfe182..3b83c455a2c 100644
--- a/src/networklayer/ipv4/ChangeLog
+++ b/src/networklayer/ipv4/ChangeLog
@@ -33,6 +33,20 @@
 	if you simulate multicast networks by setting the
 	'forwardMulticast' parameter of Router modules.
 
+2012-03-04  Andras Varga
+
+    - Added a RoutingTableRecorder module that records all the changes 
+      in the routing table to a file.
+    - Better dump method for routing table.
+
+2012-03-04  Levente Meszaros
+
+    Fixed routing table change notifications.
+
+2012-02-20  Tamas Borbely
+
+    Added printMulticastRoutingTable() to IRoutingTable
+
 2012-02-15  Tamas Borbely
 
 	The multicastTtlThreshold field is added to IPv4InterfaceData.
diff --git a/src/networklayer/ospfv2/ChangeLog b/src/networklayer/ospfv2/ChangeLog
index 591917cbef8..7388f06656c 100644
--- a/src/networklayer/ospfv2/ChangeLog
+++ b/src/networklayer/ospfv2/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-01  Levente Meszaros
+
+    Gateway is now correcty set on routing entries.
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2012-01-19  Andras Varga
diff --git a/src/nodes/inet/ChangeLog b/src/nodes/inet/ChangeLog
index 5f6e99642e9..c5b52a4ba40 100644
--- a/src/nodes/inet/ChangeLog
+++ b/src/nodes/inet/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-26  Zoltan Bojthe
+
+   Added IPingApp interface and support for more than one PingApp in a host.
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2012-01-11  Zoltan Bojthe
diff --git a/src/nodes/ipv6/ChangeLog b/src/nodes/ipv6/ChangeLog
index b707d4fb152..1d36b1a8b16 100644
--- a/src/nodes/ipv6/ChangeLog
+++ b/src/nodes/ipv6/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-26  Zoltan Bojthe
+
+    Added IPingApp interface and support for more than one PingApp in a host.
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2011-11-18  ------ INET-1.99.2 released ------
diff --git a/src/transport/tcp_lwip/ChangeLog b/src/transport/tcp_lwip/ChangeLog
index b92f3c6e2c6..a25d185c768 100644
--- a/src/transport/tcp_lwip/ChangeLog
+++ b/src/transport/tcp_lwip/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-04  Zoltan Bojthe
+
+    ICMP messages are correctly handled now.
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2012-02-08  Andras Varga
diff --git a/src/transport/tcp_nsc/ChangeLog b/src/transport/tcp_nsc/ChangeLog
index fa260f64378..c7f6e654f32 100644
--- a/src/transport/tcp_nsc/ChangeLog
+++ b/src/transport/tcp_nsc/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-04  Zoltan Bojthe
+
+    ICMP messages are correctly handled now.
+
 2012-02-24  ------ inet-1.99.3 released ------
 
 2012-02-08  Andras Varga