diff --git a/events/Event.cpp b/events/Event.cpp
index ea3d46fe..0f76b438 100644
--- a/events/Event.cpp
+++ b/events/Event.cpp
@@ -1,4 +1,5 @@
 #include "Event.h"
+
 namespace EVENT {
 EventId_t getEventId(Event event) {
 	return (event & 0xFFFF);
@@ -8,7 +9,8 @@ EventSeverity_t getSeverity(Event event) {
 	return ((event >> 16) & 0xFF);
 }
 
-Event makeEvent(EventId_t eventId, EventSeverity_t eventSeverity) {
-	return (eventSeverity << 16) + (eventId & 0xFFFF);
+Event makeEvent(uint8_t subsystemId, uint8_t uniqueEventId,
+		EventSeverity_t eventSeverity) {
+	return (eventSeverity << 16) + (subsystemId * 100) + uniqueEventId;
 }
 }
diff --git a/events/Event.h b/events/Event.h
index aba156f2..90ff1a90 100644
--- a/events/Event.h
+++ b/events/Event.h
@@ -18,9 +18,10 @@ EventId_t getEventId(Event event);
 
 EventSeverity_t getSeverity(Event event);
 
-Event makeEvent(EventId_t eventId, EventSeverity_t eventSeverity);
-
+Event makeEvent(uint8_t subsystemId, uint8_t uniqueEventId,
+		EventSeverity_t eventSeverity);
 }
+
 namespace SEVERITY {
 	static const EventSeverity_t INFO = 1;
 	static const EventSeverity_t LOW = 2;