diff --git a/Makefile.am b/Makefile.am
index d4c86e6aca..282ea209d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,8 @@ diameter_DATA = \
diameter/TGPPS9.xml \
diameter/TGPPSh.xml \
diameter/Vodafone.xml \
- diameter/AlcatelLucent.xml
+ diameter/AlcatelLucent.xml \
+ diameter/Nokia.xml
#
# Install the DTDs directory files in the "dtds" subdirectory
diff --git a/diameter/Nokia.xml b/diameter/Nokia.xml
new file mode 100644
index 0000000000..c70a3b816c
--- /dev/null
+++ b/diameter/Nokia.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 680cc66862..aa8463e887 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -23,7 +23,8 @@
-
+
+
]>
@@ -182,21 +183,22 @@
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
@@ -6181,4 +6183,5 @@
&Cisco;
&Vodafone;
&AlcatelLucent;
+ &Nokia;
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 1f95a2c135..fba901e156 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -423,6 +423,7 @@ File "..\..\diameter\imscxdx.xml"
File "..\..\diameter\mobileipv4.xml"
File "..\..\diameter\mobileipv6.xml"
File "..\..\diameter\nasreq.xml"
+File "..\..\diameter\Nokia.xml"
File "..\..\diameter\sip.xml"
File "..\..\diameter\sunping.xml"
File "..\..\diameter\TGPPGmb.xml"