diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 026ebfd8..d75483d9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,7 +10,7 @@ lib_xua Change Log
     to XUA_AudioHub()
   * CHANGE:    NO_USB define renamed to XUA_USB_EN
   * CHANGE:    XUA_AudioHub() no longer pars S/PDIF transmitter task
-  * CHANGE:    Moved to using lib_spdif (from module_spdif_tx)
+  * CHANGE:    Moved to lib_spdif (from module_spdif_tx & module_spdif_rx)
 
 0.1.2
 -----
diff --git a/lib_xua/src/core/clocking/clockgen.xc b/lib_xua/src/core/clocking/clockgen.xc
index e88ed27e..7c5da305 100644
--- a/lib_xua/src/core/clocking/clockgen.xc
+++ b/lib_xua/src/core/clocking/clockgen.xc
@@ -7,8 +7,8 @@
 #include "xua.h"
 #include "xua_commands.h"
 
-#if (SPDIF_RX == 1)
-#include "SpdifReceive.h"
+#if (SPDIF_RX)
+#include "spdif.h"
 #endif
 
 #define LOCAL_CLOCK_INCREMENT       166667
@@ -506,14 +506,14 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
                 switch(tmp2)
                 {
                     /* LEFT */
-                    case FRAME_X:
-                    case FRAME_Z:
+                    case SPDIF_FRAME_X:
+                    case SPDIF_FRAME_Z:
 
                         spdifLeft = tmp << 4;
                         break;
 
                     /* RIGHT */
-                    case FRAME_Y:
+                    case SPDIF_FRAME_Y:
 
                         /* Only store sample if not in overflow and stream is reasonably valid */
                         if(!spdifOverflow && clockValid[CLOCK_SPDIF_INDEX])