diff --git a/lnet/ChangeLog b/lnet/ChangeLog
index bc1727d6a83f7b90c6bd68edb46463b4bbcecc06..f12f2dc916933ced9bb7396f85a532f6d3e8939f 100644
--- a/lnet/ChangeLog
+++ b/lnet/ChangeLog
@@ -30,6 +30,12 @@
 	ptllnd    - Portals 3.3 / UNICOS/lc 1.5.x, 2.0.x
        * bug fixes
 	
+Severity   : minor
+Frequency  : rare
+Description: the_lnet.ln_finalizing was not set when the current thread is
+             about to complete messages. It only affects multi-threaded 
+	     user space LNet.
+	
 Severity   : normal
 Frequency  : rare
 Bugzilla   : 11472
diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c
index d29aa1e9ab621d769c22f86101fd2afc85fa8899..c46ad1a4c6a4ccad7b89113484d492e87a09ec70 100644
--- a/lnet/lnet/lib-msg.c
+++ b/lnet/lnet/lib-msg.c
@@ -199,6 +199,8 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status)
 #else
         if (the_lnet.ln_finalizing)
                 goto out;
+
+        the_lnet.ln_finalizing = 1;
 #endif
 
         while (!list_empty(&the_lnet.ln_finalizeq)) {