diff --git a/Asuro.iso b/Asuro.iso
index e90159f2..23211f92 100644
Binary files a/Asuro.iso and b/Asuro.iso differ
diff --git a/bin/kernel.bin b/bin/kernel.bin
index d80eb504..9f122623 100755
Binary files a/bin/kernel.bin and b/bin/kernel.bin differ
diff --git a/iso/boot/asuro.bin b/iso/boot/asuro.bin
index d80eb504..9f122623 100755
Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ
diff --git a/lib/arp.ppu b/lib/arp.ppu
index d43afb5f..72fa6239 100644
Binary files a/lib/arp.ppu and b/lib/arp.ppu differ
diff --git a/lib/asuro.ppu b/lib/asuro.ppu
index 31cbb594..6df5755e 100644
Binary files a/lib/asuro.ppu and b/lib/asuro.ppu differ
diff --git a/lib/libpconsole.a b/lib/libpconsole.a
index 18cecefe..cbdddf65 100644
Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ
diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a
index 58b72271..49754735 100644
Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ
diff --git a/lib/libpsystem.a b/lib/libpsystem.a
index 756f81c8..1e512fa8 100644
Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ
diff --git a/lib/shell.ppu b/lib/shell.ppu
index e13c92e2..e9d36371 100644
Binary files a/lib/shell.ppu and b/lib/shell.ppu differ
diff --git a/lib/terminal.ppu b/lib/terminal.ppu
index 762019ed..d3e9978f 100644
Binary files a/lib/terminal.ppu and b/lib/terminal.ppu differ
diff --git a/src/driver/net/l3/arp.pas b/src/driver/net/l3/arp.pas
index 2cdc3dbf..4211acfc 100644
--- a/src/driver/net/l3/arp.pas
+++ b/src/driver/net/l3/arp.pas
@@ -166,8 +166,10 @@ begin
     { Process ARP Packet }
     Merge:= false;
     CacheElement:= findCacheRecordByIP(@AHeader.Source_Protocol[0]);
+    if CacheElement = nil then CacheElement:= findCacheRecordByMAC(@AHeader.Source_Hardware[0]);
     if CacheElement <> nil then begin
         copyMAC(@AHeader.Source_Hardware[0], @CacheElement^.MAC[0]);
+        copyIPv4(@AHeader.Source_Protocol[0], @CacheElement^.IP[0]);
         Merge:= true;
     end else begin
         if IPEqual(@AHeader.Destination_Protocol[0], @getIPv4Config^.Address[0]) then begin
diff --git a/src/include/asuro.pas b/src/include/asuro.pas
index c8f26213..7aa511dc 100644
--- a/src/include/asuro.pas
+++ b/src/include/asuro.pas
@@ -9,14 +9,14 @@ const
      VERSION_SUB   = '1';
      REVISION      = '677';
      RELEASE       = 'ia';
-     LINE_COUNT    = 28044;
+     LINE_COUNT    = 28046;
      FILE_COUNT    = 90;
      DRIVER_COUNT  = 32;
      FPC_VERSION   = '2.6.4';
      NASM_VERSION  = '2.10.09';
      MAKE_VERSION  = '3.81';
      COMPILE_DATE  = '11/05/18';
-     COMPILE_TIME  = '10:09:01';
+     COMPILE_TIME  = '10:10:37';
  
 implementation