diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index d7e6c85af7..61e0254c5b 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-09  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* insetcite.C (getNatbibLabels): correct check for updating the 
+	natbib labels cache (we didn't consider the buffer).
+
 2006-12-29  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* insetcollapsable.C (hasFixedWidth): new virtual method, returns
diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C
index 373884f2d0..a9536cda90 100644
--- a/src/insets/insetcite.C
+++ b/src/insets/insetcite.C
@@ -86,7 +86,7 @@ string const getNatbibLabel(Buffer const & buffer,
 	}
 
 	// build the keylist only if the bibfiles have been changed
-	if (cached_keys.empty() || bibfileStatus.empty() || changed) {
+	if (cached_keys[&buffer].empty() || bibfileStatus.empty() || changed) {
 		typedef vector<std::pair<string, string> > InfoType;
 		InfoType bibkeys;
 		buffer.fillWithBibKeys(bibkeys);
diff --git a/status.14x b/status.14x
index 0d7b519922..a44211e0fa 100644
--- a/status.14x
+++ b/status.14x
@@ -171,6 +171,9 @@ What's new
 - On Mac OS X, make sure to view files with the same application as
   the Finder uses.
 
+- The natbib labels weren't always displayed correctly when opening
+  a document. This is fixed.
+
 * Build/installation:
 
 - Allow autoconf 2.60 and 2.61 for building.