diff --git a/virtualsmartcard/src/ifd-vpcd/ifd-vpcd.c b/virtualsmartcard/src/ifd-vpcd/ifd-vpcd.c
index c7ecee3..c055016 100644
--- a/virtualsmartcard/src/ifd-vpcd/ifd-vpcd.c
+++ b/virtualsmartcard/src/ifd-vpcd/ifd-vpcd.c
@@ -31,11 +31,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* pcscd allows at most 16 readers. We will use 10.
- * See PCSCLITE_MAX_READERS_CONTEXTS in pcsclite.h */
-#define VICC_MAX_SLOTS \
-        (PCSCLITE_MAX_READERS_CONTEXTS > 6 ? \
-        PCSCLITE_MAX_READERS_CONTEXTS-6 : 1)
+/* pcscd allows at most 16 readers. Apple's SmartCardServices on OS X 10.10
+ * freaks out if more than 8 slots are registered. We want only two slots... */
+#define VICC_MAX_SLOTS (2 <= PCSCLITE_MAX_READERS_CONTEXTS ? 2 : PCSCLITE_MAX_READERS_CONTEXTS)
 const unsigned char vicc_max_slots = VICC_MAX_SLOTS;
 
 #ifdef HAVE_DEBUGLOG_H