diff --git a/lib/packetfu/protos/icmpv6/header.rb b/lib/packetfu/protos/icmpv6/header.rb
index d7c504f4..109fcf22 100644
--- a/lib/packetfu/protos/icmpv6/header.rb
+++ b/lib/packetfu/protos/icmpv6/header.rb
@@ -16,7 +16,9 @@ module PacketFu
   #   Int8    :icmp_code                        # Code
   #   Int16   :icmp_sum    Default: calculated  # Checksum
   #   String  :body
-  class ICMPv6Header < Struct.new(:icmpv6_type, :icmpv6_code, :icmpv6_sum, :body)
+  class ICMPv6Header < Struct.new(:icmpv6_type, :icmpv6_code, :icmpv6_sum,
+                                    :icmpv6_reserved, :icmpv6_tgt, :icmpv6_opt_type,
+                                    :icmpv6_opt_len, :icmpv6_lla, :body)
     include StructFu
 
     PROTOCOL_NUMBER = 58
@@ -26,6 +28,11 @@ def initialize(args={})
         Int8.new(args[:icmpv6_type]),
         Int8.new(args[:icmpv6_code]),
         Int16.new(args[:icmpv6_sum]),
+        Int32.new(args[:icmpv6_reserved]),
+        AddrIpv6.new.read(args[:icmpv6_tgt] || ("\x00" * 16)),
+        Int8.new(args[:icmpv6_opt_type]),
+        Int8.new(args[:icmpv6_opt_len]),
+        EthMac.new.read(args[:icmpv6_lla]),
         StructFu::String.new.read(args[:body])
       )
     end
@@ -59,11 +66,55 @@ def icmpv6_code; self[:icmpv6_code].to_i; end
     def icmpv6_sum=(i); typecast i; end
     # Getter for the checksum.
     def icmpv6_sum; self[:icmpv6_sum].to_i; end
+    # Setter for the reserved.
+    def icmpv6_reserved=(i); typecast i; end
+    # Getter for the reserved.
+    def icmpv6_reserved; self[:icmpv6_reserved].to_i; end
+    # Setter for the target address.
+    def icmpv6_tgt=(i); typecast i; end
+    # Getter for the target address.
+    def icmpv6_tgt; self[:icmpv6_tgt].to_i; end
+    # Setter for the options type field.
+    def icmpv6_opt_type=(i); typecast i; end
+    # Getter for the options type field.
+    def icmpv6_opt_type; self[:icmpv6_opt_type].to_i; end
+    # Setter for the options length.
+    def icmpv6_opt_len=(i); typecast i; end
+    # Getter for the options length.
+    def icmpv6_opt_len; self[:icmpv6_opt_len].to_i; end
+    # Setter for the link local address.
+    def icmpv6_lla=(i); typecast i; end
+    # Getter for the link local address.
+    def icmpv6_lla; self[:icmpv6_lla].to_i; end
 
     def icmpv6_sum_readable
       "0x%04x" % icmpv6_sum
     end
-      
-  end
 
+    # Get target address in a more readable form.
+    def icmpv6_taddr
+        self[:icmpv6_tgt].to_x
+    end
+
+    # Set the target address in a more readable form.
+    def icmpv6_taddr=(str)
+        self[:icmpv6_tgt].read_x(str)
+    end
+
+     # Sets the link local address in a more readable way.
+    def icmpv6_lladdr=(mac)
+        mac = EthHeader.mac2str(mac)
+        self[:icmpv6_lla].read mac
+        self[:icmpv6_lla]
+    end
+
+    # Gets the link local address in a more readable way.
+    def icmpv6_lladdr
+        EthHeader.str2mac(self[:icmpv6_lla].to_s)
+    end
+
+    alias :icmpv6_lla_readable :icmpv6_lladdr
+    alias :icmpv6_tgt_readable :icmpv6_taddr
+
+  end
 end
diff --git a/lib/packetfu/protos/icmpv6/mixin.rb b/lib/packetfu/protos/icmpv6/mixin.rb
index b25d5b4e..bcec7da7 100644
--- a/lib/packetfu/protos/icmpv6/mixin.rb
+++ b/lib/packetfu/protos/icmpv6/mixin.rb
@@ -9,6 +9,20 @@ def icmpv6_code=(v); self.icmpv6_header.icmpv6_code= v; end
     def icmpv6_code; self.icmpv6_header.icmpv6_code; end
     def icmpv6_sum=(v); self.icmpv6_header.icmpv6_sum= v; end
     def icmpv6_sum; self.icmpv6_header.icmpv6_sum; end
+    def icmpv6_reserved=(v); self.icmpv6_header.icmpv6_reserved= v; end
+    def icmpv6_reserved; self.icmpv6_header.icmpv6_reserved; end
+    def icmpv6_tgt=(v); self.icmpv6_header.icmpv6_tgt= v; end
+    def icmpv6_tgt; self.icmpv6_header.icmpv6_tgt; end
+    def icmpv6_taddr=(v); self.icmpv6_header.icmpv6_taddr= v; end
+    def icmpv6_taddr; self.icmpv6_header.icmpv6_taddr; end
+    def icmpv6_tgt_readable; self.icmpv6_header.icmpv6_tgt_readable; end
+    def icmpv6_opt_type=(v); self.icmpv6_header.icmpv6_opt_type= v; end
+    def icmpv6_opt_type; self.icmpv6_header.icmpv6_opt_type; end
+    def icmpv6_opt_len=(v); self.icmpv6_header.icmpv6_opt_len=v; end
+    def icmpv6_opt_len;self.icmpv6_header.icmpv6_opt_len; end
+    def icmpv6_lla=(v); self.icmpv6_header.icmpv6_lla=v; end
+    def icmpv6_lla;self.icmpv6_header.icmpv6_lla; end
+    def icmpv6_lla_readable; self.icmpv6_header.icmpv6_lla_readable; end 
     def icmpv6_sum_readable; self.icmpv6_header.icmpv6_sum_readable; end
   end
 end