diff --git a/src/pkcs11/README b/src/pkcs11/README
index 73766851..8f190150 100644
--- a/src/pkcs11/README
+++ b/src/pkcs11/README
@@ -33,8 +33,3 @@ Notes
 
 Netscape seems to show more information about the security module
 than mozilla. Otherwise all stuff is untested.	
-
-Please note that the library currently writes debug log to
-/tmp/opensc-pkcs11.log.
-
-
diff --git a/src/pkcs11/pkcs11-global.c b/src/pkcs11/pkcs11-global.c
index ea557c94..c3073f13 100644
--- a/src/pkcs11/pkcs11-global.c
+++ b/src/pkcs11/pkcs11-global.c
@@ -40,7 +40,11 @@ CK_RV C_Initialize(CK_VOID_PTR pReserved)
 	rc = sc_establish_context(&context);
 	if (rc != 0)
 		return CKR_DEVICE_ERROR;
+#ifdef DEBUG
         context->use_std_output = 1;
+#else
+        context->use_std_output = 0;
+#endif
 
         pool_initialize(&session_pool);
 	for (i=0; i<SC_PKCS11_MAX_VIRTUAL_SLOTS; i++)