diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index ce6776d24c..285d4957a5 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -634,7 +634,9 @@
     <Compile Include="Consoles\Nintendo\QuickNES\QuickNES.IDebuggable.cs">
       <DependentUpon>QuickNES.cs</DependentUpon>
     </Compile>
-    <Compile Include="Consoles\Nintendo\QuickNES\QuickNES.IDisassembler.cs" />
+    <Compile Include="Consoles\Nintendo\QuickNES\QuickNES.IDisassembler.cs">
+        <DependentUpon>QuickNES.cs</DependentUpon>
+    </Compile>
     <Compile Include="Consoles\Nintendo\QuickNES\QuickNES.IInputPollable.cs">
       <DependentUpon>QuickNES.cs</DependentUpon>
     </Compile>
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs
new file mode 100644
index 0000000000..045e4028ad
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Cores.Components.M6502;
+
+namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
+{
+	public partial class QuickNES : IDisassemblable
+	{
+		public string Cpu
+		{
+			get
+			{
+				return "6502";
+			}
+			set
+			{
+			}
+		}
+
+		public string PCRegisterName
+		{
+			get { return "PC"; }
+		}
+
+		public IEnumerable<string> AvailableCpus
+		{
+			get { yield return "6502"; }
+		}
+
+		public string Disassemble(MemoryDomain m, uint addr, out int length)
+		{
+			return MOS6502X.Disassemble((ushort)addr, out length, PeekSystemBus);
+		}
+
+		private byte PeekSystemBus(ushort addr)
+		{
+			return _memoryDomains.SystemBus.PeekByte(addr);
+		}
+	}
+}