diff --git a/library/DIAMETER_rfc5447_Templates.ttcn b/library/DIAMETER_rfc5447_Templates.ttcn
index 4c119c7..f62c96d 100644
--- a/library/DIAMETER_rfc5447_Templates.ttcn
+++ b/library/DIAMETER_rfc5447_Templates.ttcn
@@ -14,6 +14,19 @@
 import from DIAMETER_Templates all;
 import from Osmocom_Types all;
 import from Misc_Helpers all;
+import from DIAMETER_rfc4004_Templates all;
+
+/* 4.2.1. MIP6-Agent-Info AVP */
+template (value) GenericAVP ts_AVP_MIP6AgentInfo(template (value) MIPv4_NONE_MIP_Home_Agent_Address addr) := {
+	avp := {
+		avp_header := ts_DIA_Hdr(c_AVP_Code_MIPv6_NONE_MIP6_Agent_Info),
+		avp_data := {
+			avp_MIPv6_NONE_MIP6_Agent_Info := {
+				ts_AVP_MIPHomeAgentAddress(addr)
+			}
+		}
+	}
+}
 
 /* 4.2.5. MIP6-Feature-Vector AVP */
 const uint64_t DIA_RFC5447_MIP6_Feature_Vector_MIP6_INTEGRATED := hex2int('0000000000000001'H);