diff -r c10c50cb8ac9 -r e0223da68c32 util/systemc/sc_module.cc
--- a/util/systemc/sc_module.cc	Tue Jan 03 17:31:39 2017 +0000
+++ b/util/systemc/sc_module.cc	Sun Feb 05 14:07:54 2017 +0100
@@ -42,6 +42,7 @@
  * Authors: Nathan Binkert
  *          Steve Reinhardt
  *          Andrew Bardsley
+ *          Christian Menard
  */
 
 /**
@@ -76,7 +77,7 @@
     ::setClockFrequency(1000000000000);
 }
 
-Module::Module(sc_core::sc_module_name name) : sc_core::sc_module(name),
+Module::Module(sc_core::sc_module_name name) : sc_core::sc_channel(name),
     in_simulate(false)
 {
     SC_METHOD(eventLoop);
diff -r c10c50cb8ac9 -r e0223da68c32 util/systemc/sc_module.hh
--- a/util/systemc/sc_module.hh	Tue Jan 03 17:31:39 2017 +0000
+++ b/util/systemc/sc_module.hh	Sun Feb 05 14:07:54 2017 +0100
@@ -42,6 +42,7 @@
  * Authors: Nathan Binkert
  *          Steve Reinhardt
  *          Andrew Bardsley
+ *          Christian Menard
  */
 
 /**
@@ -83,7 +84,7 @@
  *  This functionality is wrapped in an sc_module as its intended that
  *  the a class representing top level simulation control should be derived
  *  from this class. */
-class Module : public sc_core::sc_module
+class Module : public sc_core::sc_channel
 {
   protected:
     /** Event to trigger (via. ::notify) for event scheduling from