diff --git a/ccid_host/ccid_slot_sim.c b/ccid_host/ccid_slot_sim.c
index 1bd514a..dc33114 100644
--- a/ccid_host/ccid_slot_sim.c
+++ b/ccid_host/ccid_slot_sim.c
@@ -100,9 +100,10 @@
 {
 	if (enable) {
 		cs->icc_powered = true;
-		/* FIXME: What to do about ATR? */
+		cs->icc_in_reset = false;
 	} else {
 		cs->icc_powered = false;
+		cs->icc_in_reset = true;
 	}
 }
 
diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile
index 3d89b25..0e1f2c6 100644
--- a/sysmoOCTSIM/gcc/Makefile
+++ b/sysmoOCTSIM/gcc/Makefile
@@ -83,6 +83,10 @@
 	atmel_start.o \
 	ccid_common/ccid_proto.o \
 	ccid_common/ccid_device.o \
+	ccid_common/iso7816_fsm.o \
+	ccid_common/cuart.o \
+	ccid_common/ccid_slot_fsm.o \
+	cuart_driver_asf4_usart_async.o \
 	command.o \
 	dma_m2m/dma_memory.o \
 	driver_init.o \