diff --git a/Makefile.am b/Makefile.am
index 741df08e33..1a189a779e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,6 +93,7 @@ dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
 	diameter/Nokia.xml \
 	diameter/NokiaSiemensNetworks.xml \
 	diameter/SKT.xml \
+	diameter/HP.xml \
 	diameter/VerizonWireless.xml
 
 #
diff --git a/diameter/HP.xml b/diameter/HP.xml
new file mode 100644
index 0000000000..1d93698aaf
--- /dev/null
+++ b/diameter/HP.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<application id="16777305" name="HP Diameter Topology Discovery" uri="http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xml">
+	<command name="Peer Information"	code="100" vendor-id="HP">
+	<command name="Fetch Peers"		code="101" vendor-id="HP">
+	<command name="Subscribe Change"	code="102" vendor-id="HP">
+	<command name="Notify Change"		code="103" vendor-id="HP">
+
+	<avp name="Auth-Application-Id" code="258" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+		<type type-name="AppId"/>
+		<enum name="HP Diameter Topology Discovery" code="16777305"/>
+		<enum name="3GPP S6a" code="16777251"/>
+		<enum name="3GPP S13" code="16777252"/>
+	</avp>
+	<avp name="Peer-State" code="200"  vendor-id="HP" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="Down" code="0"/>
+		<enum name="Up" code="1"/>
+	</avp>
+	<avp name="Peer-Name" code="201"  vendor-id="HP" mandatory="must" vendor-bit="must">
+		<type type-name="DiameterIdentity"/>
+	</avp>
+
+	<avp name="Peer-Identity" code="202"  vendor-id="HP" mandatory="must" vendor-bit="must">
+		<type type-name="DiameterIdentity"/>
+	</avp>
+	<avp name="Peer-State-Change" code="203" vendor-id="HP" mandatory="must" vendor-bit="must">
+		<grouped>
+			<gavp name="Peer-Name"/>
+			<gavp name="Peer-Identity"/>
+			<gavp name="Peer-State"/>
+		</grouped>
+	</avp>
+	<avp name="More-Peers" code="204" vendor-id="HP" mandatory="must" vendor-bit="must">
+		<grouped>
+			<gavp name="Peer-Name"/>
+			<gavp name="Peer-Identity"/>
+			<gavp name="Peer-State"/>
+			<gavp name="Peer-State-Change"/>
+		</grouped>
+	</avp>
+	<avp name="Peer-Type" code="205"  vendor-id="HP" mandatory="must" vendor-bit="must">
+		<type type-name="Enumerated"/>
+		<enum name="Client" code="0"/>
+		<enum name="Server" code="1"/>
+		<enum name="ClientAndServer" code="2"/>
+		<enum name="Proxy" code="3"/>
+	</avp>
+</application>
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 476fba9f7e..91cbe07566 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -31,6 +31,7 @@
 	<!ENTITY SKT			SYSTEM "SKT.xml">
 	<!ENTITY ChinaTelecom		SYSTEM "ChinaTelecom.xml">
 	<!ENTITY VerizonWireless	SYSTEM "VerizonWireless.xml">
+	<!ENTITY HP			SYSTEM "HP.xml">
 	<!ENTITY Custom			SYSTEM "Custom.xml">
 ]>
 <dictionary>
@@ -6744,5 +6745,6 @@
 	&SKT;
 	&ChinaTelecom;
 	&VerizonWireless;
+	&HP;
 	&Custom;
 </dictionary>
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 3c96c78b44..a301c6b258 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -428,6 +428,7 @@ File "..\..\diameter\etsie2e4.xml"
 File "..\..\diameter\gqpolicy.xml"
 File "..\..\diameter\imscxdx.xml"
 File "..\..\diameter\SKT.xml"
+File "..\..\diameter\HP.xml"
 File "..\..\diameter\mobileipv4.xml"
 File "..\..\diameter\mobileipv6.xml"
 File "..\..\diameter\nasreq.xml"