diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 64a35d5438..69a6d1fc97 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-16  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* QDocumentDialog.C (updateNumbering): don't include headings
+	that have no counter in their label (bug 2910).
+
+	* ui/NumberingModuleBase.ui: show scrollbar when appropriate.
+
 2006-09-19  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* QtView.C (hasFocus): always return true. This is a temporary
diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C
index fb0bba6a3e..16d5220afa 100644
--- a/src/frontends/qt2/QDocumentDialog.C
+++ b/src/frontends/qt2/QDocumentDialog.C
@@ -390,7 +390,8 @@ void QDocumentDialog::updateNumbering()
 	QListViewItem * item = 0;
 	for ( ; cit != end ; ++cit) {
 		int const toclevel = (*cit)->toclevel;
-		if (toclevel != LyXLayout::NOT_IN_TOC) {
+		if (toclevel != LyXLayout::NOT_IN_TOC 
+		    && (*cit)->labeltype == LABEL_COUNTER) {
 			item = new QListViewItem(numberingModule->tocLV,
 						 item, qt_((*cit)->name()));
 			item->setText(1, (toclevel <= depth) ? yes : no);
diff --git a/src/frontends/qt2/ui/NumberingModuleBase.ui b/src/frontends/qt2/ui/NumberingModuleBase.ui
index a6a370f610..74041ae6ea 100644
--- a/src/frontends/qt2/ui/NumberingModuleBase.ui
+++ b/src/frontends/qt2/ui/NumberingModuleBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>310</width>
+            <width>306</width>
             <height>323</height>
         </rect>
     </property>
@@ -185,11 +185,11 @@
             </property>
             <property stdset="1">
                 <name>vScrollBarMode</name>
-                <enum>AlwaysOff</enum>
+                <enum>Auto</enum>
             </property>
             <property stdset="1">
                 <name>hScrollBarMode</name>
-                <enum>AlwaysOff</enum>
+                <enum>Auto</enum>
             </property>
             <property stdset="1">
                 <name>rootIsDecorated</name>
diff --git a/status.14x b/status.14x
index 4bba820013..26c5cd179c 100644
--- a/status.14x
+++ b/status.14x
@@ -58,6 +58,8 @@ What's new
 
 - Fix import of \fullcite commands from LaTeX.
 
+- Don't show starred sections in Document->Numbering & TOC (bug 2910)
+
 * Build/installation: