diff --git a/src/cpu/Makefile.am b/src/cpu/Makefile.am
index 97ef51e2..e0d9fd7a 100644
--- a/src/cpu/Makefile.am
+++ b/src/cpu/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = core_16
+SUBDIRS = core_16 core_full
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_LIBRARIES = libcpu.a
-libcpu_a_SOURCES = callback.cpp cpu.cpp flags.cpp modrm.cpp modrm.h slow_16.cpp instructions.h
\ No newline at end of file
+libcpu_a_SOURCES = callback.cpp cpu.cpp flags.cpp modrm.cpp modrm.h slow_16.cpp core_full.cpp instructions.h
\ No newline at end of file
diff --git a/src/cpu/core_full/Makefile.am b/src/cpu/core_full/Makefile.am
new file mode 100644
index 00000000..41fbe6a2
--- /dev/null
+++ b/src/cpu/core_full/Makefile.am
@@ -0,0 +1,3 @@
+
+noinst_HEADERS = ea_lookup.h load.h loadwrite.h op.h optable.h save.h \
+		 string.h support.h