diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs
index eccebc2ca1..8d95f46658 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs
@@ -12,6 +12,16 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 		{
 			_board.Controller = controller;
 
+
+			if (_tracer.Enabled)
+			{
+				_board.Cpu.TraceCallback = s => _tracer.Put(s);
+			}
+			else
+			{
+				_board.Cpu.TraceCallback = null;
+			}
+
 			if (controller.IsPressed("Next Disk") && !_nextPressed)
 			{
 				_nextPressed = true;
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
index c572a9f936..d33c794766 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
@@ -56,6 +56,9 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 
 			ser.Register<IVideoProvider>(_board.Vic);
 			ser.Register<IDriveLight>(this);
+
+			_tracer = new TraceBuffer { Header = _board.Cpu.TraceHeader };
+			ser.Register<ITraceable>(_tracer);
 		}
 
 		// Currently we will require at least one rom.  If multiple they MUST be all the same media type in the same format
@@ -135,7 +138,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 		private int _frameCycles;
 
 		private int _frame;
-
+		private ITraceable _tracer;
 		// Disk stuff
 
 		private bool _nextPressed;
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
index 3228d27c13..7605d704e3 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
@@ -1,6 +1,7 @@
 using System;
 
 using BizHawk.Common;
+using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores.Components.M6502;
 
 namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
@@ -46,6 +47,17 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 			HardReset();
 		}
 
+		public string TraceHeader
+		{
+			get { return "6510: PC, machine code, mnemonic, operands, registers (A, X, Y, P, SP), flags (NVTBDIZCR)"; }
+		}
+
+		public Action<TraceInfo> TraceCallback
+		{
+			get { return _cpu.TraceCallback; }
+			set { _cpu.TraceCallback = value; }
+		}
+
 		public void SetOverflow()
 		{
 		}