--- a/master/fsm_coe.c	Tue Nov 06 11:49:55 2012 +0100
+++ b/master/fsm_coe.c	Tue Nov 06 14:23:44 2012 +0100
@@ -38,6 +38,7 @@
 #include "master.h"
 #include "mailbox.h"
 #include "fsm_coe.h"
+#include "slave_config.h"
 
 /*****************************************************************************/
 
@@ -269,6 +270,13 @@
         return 1;
     }
 
+    {
+        ec_slave_config_t *sc = fsm->slave->config;
+        if (sc) {
+            ec_coe_emerg_ring_push(&sc->emerg_ring, data + 2);
+        }
+    }
+
     EC_SLAVE_WARN(fsm->slave, "CoE Emergency Request received:\n"
             "Error code 0x%04X, Error register 0x%02X, data:\n",
             EC_READ_U16(data + 2), EC_READ_U8(data + 4));