diff --git a/src/pkcs11/pkcs11-global.c b/src/pkcs11/pkcs11-global.c
index 97fd5d49..a5cfc993 100644
--- a/src/pkcs11/pkcs11-global.c
+++ b/src/pkcs11/pkcs11-global.c
@@ -360,13 +360,13 @@ CK_RV C_GetInfo(CK_INFO_PTR pInfo)
 		pInfo->cryptokiVersion.minor = 11;
 	}
 	strcpy_bp(pInfo->manufacturerID,
-		  "OpenSC (www.opensc-project.org)",
+		  OPENSC_VS_FF_COMPANY_NAME,
 		  sizeof(pInfo->manufacturerID));
 	strcpy_bp(pInfo->libraryDescription,
-		  "Smart card PKCS#11 API",
+		  OPENSC_VS_FF_PRODUCT_NAME,
 		  sizeof(pInfo->libraryDescription));
-	pInfo->libraryVersion.major = 0;
-	pInfo->libraryVersion.minor = 0; /* FIXME: use 0.116 for 0.11.6 from autoconf */
+	pInfo->libraryVersion.major = OPENSC_VERSION_MAJOR;
+	pInfo->libraryVersion.minor = OPENSC_VERSION_MINOR;
 
 	sc_pkcs11_unlock();
 	return rv;
diff --git a/src/pkcs11/slot.c b/src/pkcs11/slot.c
index 8ea11f0b..11d4391c 100644
--- a/src/pkcs11/slot.c
+++ b/src/pkcs11/slot.c
@@ -53,7 +53,7 @@ static struct sc_pkcs11_slot * reader_get_slot(sc_reader_t *reader)
 static void init_slot_info(CK_SLOT_INFO_PTR pInfo)
 {
 	strcpy_bp(pInfo->slotDescription, "Virtual hotplug slot", 64);
-	strcpy_bp(pInfo->manufacturerID, "OpenSC (www.opensc-project.org)", 32);
+	strcpy_bp(pInfo->manufacturerID, OPENSC_VS_FF_COMPANY_NAME, 32);
 	pInfo->flags = CKF_REMOVABLE_DEVICE | CKF_HW_SLOT;
 	pInfo->hardwareVersion.major = 0;
 	pInfo->hardwareVersion.minor = 0;
diff --git a/win32/winconfig.h.in b/win32/winconfig.h.in
index 29438878..541b38f7 100644
--- a/win32/winconfig.h.in
+++ b/win32/winconfig.h.in
@@ -96,6 +96,22 @@
 #define OPENSC_FEATURES "N/A"
 #endif
 
+#ifndef OPENSC_VERSION_MAJOR
+#define OPENSC_VERSION_MAJOR 0
+#endif
+
+#ifndef OPENSC_VERSION_MINOR
+#define OPENSC_VERSION_MINOR 15
+#endif
+
+#ifndef OPENSC_VS_FF_COMPANY_NAME
+#define OPENSC_VS_FF_COMPANY_NAME "OpenSC Project"
+#endif
+
+#ifndef OPENSC_VS_FF_PRODUCT_NAME
+#define OPENSC_VS_FF_PRODUCT_NAME "OpenSC smartcard framework"
+#endif
+
 #ifndef DEFAULT_PKCS11_PROVIDER
 #define DEFAULT_PKCS11_PROVIDER "opensc-pkcs11.dll"
 #endif