--- p11-kit-0.18.1/common/library.c	2013-04-03 08:30:32.000000000 -0700
+++ p11-kit-0.18.1.new/common/library.c	2013-04-23 17:54:08.000000000 -0700
@@ -60,7 +60,7 @@
 p11_mutex_t p11_library_mutex;
 
 #ifdef OS_UNIX
-pthread_once_t p11_library_once;
+pthread_once_t p11_library_once = PTHREAD_ONCE_INIT;
 #endif
 
 static char *