diff --git a/ccid_host/Makefile b/ccid_host/Makefile
index d7bc3be..e9f34cc 100644
--- a/ccid_host/Makefile
+++ b/ccid_host/Makefile
@@ -4,10 +4,14 @@
 all: ccid_functionfs hub_functionfs cuart_test cuart_fsm_test
 
 ccid_functionfs: ccid_main_functionfs.o \
-		 ccid_slot_sim.o \
+		 cuart_driver_tty.o \
+		 utils_ringbuffer.o \
 		 logging.o \
+		 ../ccid_common/cuart.o \
 		 ../ccid_common/ccid_proto.o \
-		 ../ccid_common/ccid_device.o
+		 ../ccid_common/ccid_device.o \
+		 ../ccid_common/ccid_slot_fsm.o \
+		 ../ccid_common/iso7816_fsm.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio
 
 hub_functionfs: hub_main_functionfs.o
diff --git a/ccid_host/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c
index 5c0bc3b..d45a936 100644
--- a/ccid_host/ccid_main_functionfs.c
+++ b/ccid_host/ccid_main_functionfs.c
@@ -152,6 +152,7 @@
 
 #include "ccid_device.h"
 #include "ccid_slot_sim.h"
+extern struct ccid_slot_ops iso_fsm_slot_ops;
 
 #ifndef FUNCTIONFS_SUPPORTS_POLL
 #include <libaio.h>
@@ -528,7 +529,7 @@
 
 	signal(SIGUSR1, &signal_handler);
 
-	ccid_instance_init(&g_ci, &c_ops, &slotsim_slot_ops, &descriptors.fs_descs.ccid,
+	ccid_instance_init(&g_ci, &c_ops, &iso_fsm_slot_ops, &descriptors.fs_descs.ccid,
 			   data_rates, clock_freqs, "", &ufh);
 	ufh.ccid_handle = &g_ci;