diff --git a/src/ChangeLog b/src/ChangeLog
index cc74b5eb31..6e03538ed5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-11  Lars Gullik Bjønnes  <larsbj@trylle.birdstep.com>
 
+	* buffer.C (getTocList): make the list also when NEW_INSETS is
+	defined.
+
 	* buffer.h: remove TocType
 
 	* buffer.C (getTocList): change to return a map<string,
diff --git a/src/buffer.C b/src/buffer.C
index e1f383d8f3..9a23ab802f 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -3702,12 +3702,46 @@ map<string, vector<Buffer::TocItem> > const Buffer::getTocList() const
 				par->inset_iterator_begin();
 			LyXParagraph::inset_iterator end =
 				par->inset_iterator_end();
-			for (; it != end; ++it) {
-				if ((*it)->LyxCode() == Inset::FLOAT_CODE) {
-					lyxerr << "Found a float!" << endl;
-					// Now find the caption in the float...
+			bool found;
+			LyXTextClassList::size_type cap;
+			tie(found, cap) = textclasslist
+				.NumberOfLayout(params.textclass, "Caption");
+			if (found) {
+				for (; it != end; ++it) {
+					if ((*it)->LyxCode() == Inset::FLOAT_CODE) {
+						InsetFloat * il =
+							static_cast<InsetFloat*>(*it);
+						
+						//lyxerr << "Found a float!" << endl;
+						string const type = il->type();
+						// Now find the caption in the float...
+						// We now tranverse the paragraphs of
+						// the inset...
+						LyXParagraph * tmp = il->inset->par;
+						while (tmp) {
+							if (tmp->layout == cap) {
+								TocItem ti;
+								ti.par = tmp;
+								ti.depth = 0;
+								ti.str = tmp->String(this, false);
+								map<string, vector<TocItem> >::iterator it = l.find(type);
+								if (it == l.end()) {
+									vector<TocItem> vti;
+									vti.push_back(ti);
+									l[type] = vti;
+								} else {
+									it->second.push_back(ti);
+								}
+							}
+							tmp = tmp->next();
+						}
+						
+					}
 				}
+			} else {
+				lyxerr << "caption not found" << endl;
 			}
+			
 #endif
 #ifndef NEW_INSETS
 		}