diff --git a/WHATS_NEW b/WHATS_NEW
index 2e1bc64ab..e8b12c6c9 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.86 -  
 =================================
+  Add proper udev library context initialization and finalization to liblvm.
   Fix last snapshot removal to avoid table reload while a device is suspended.
   Use dm_get_suspended_counter in replacement critical_section logic.
   Downgrade critical_section errors to debug level until it is moved to libdm.
diff --git a/liblvm/lvm_base.c b/liblvm/lvm_base.c
index f44b786cb..998444897 100644
--- a/liblvm/lvm_base.c
+++ b/liblvm/lvm_base.c
@@ -31,6 +31,9 @@ lvm_t lvm_init(const char *system_dir)
 	/* FIXME: logging bound to handle
 	 */
 
+	if (!udev_init_library_context())
+		stack;
+
 	/* create context */
 	/* FIXME: split create_toolcontext */
 	/* FIXME: make all globals configurable */
@@ -69,6 +72,7 @@ lvm_t lvm_init(const char *system_dir)
 void lvm_quit(lvm_t libh)
 {
 	destroy_toolcontext((struct cmd_context *)libh);
+	udev_fin_library_context();
 }
 
 int lvm_config_reload(lvm_t libh)