diff --git a/CHANGELOG b/CHANGELOG
index 1a8135451..629160f07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Added service probe for the Erlang Port Mapper Daemon. [Patrik]
+
 o [NSE] Added script broadcast-dhcp6-discover and supporting DHCPv6 library.
   The script retrieves and prints an IPv6 address and some of the DHCP6
   options. [Patrik]
diff --git a/nmap-service-probes b/nmap-service-probes
index f5b543291..c5742605d 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -10191,3 +10191,10 @@ Probe TCP couchbase-data q|\x80\x10\0\0\0\0\0\0\0\0\0\0\x15\xf0\xd1\x62\0\0\0\0\
 rarity 8
 ports 11210
 match couchbase-tap m|^\x81\x10..\0\0\0\0\0\0\0.....\0\0\0\0\0\0\0\0ep_version([._\w]+).*ep_dbname([_\\\/\w]*)|s p/Couchbase Membase/ v/$1/ i/DB name: $2/
+
+##############################NEXT PROBE##############################
+# Sends a Get all registered names probe to the EPMD daemon
+Probe TCP epmd q|\0\x01\x6e|
+rarity 8
+ports 4369
+match epmd m|^\0\0\x11\x11.*| p/Erlang Port Mapper Daemon/
\ No newline at end of file