diff --git a/lib/ChangeLog b/lib/ChangeLog
index 61b87caff4..6c29ce3139 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-29  Jürgen Spitzmüller <j.spitzmueller@gmx.de>
+
+	* layouts/memoir.layout: add providesMakeindex (bug 2623).
+
 2006-05-29  Jürgen Spitzmüller <j.spitzmueller@gmx.de>
 
 	* configure.py: use $$o where appropriate (still some
diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 7c1bc9e930..63abd2cd5e 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -13,6 +13,7 @@ SecNumDepth        2
 TocDepth           2
 DefaultStyle       Standard
 PageStyle          Headings
+ProvidesMakeidx    1
 
 
 ClassOptions
diff --git a/src/ChangeLog b/src/ChangeLog
index 54e5799812..5002861c8a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-29  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* LaTeX.C (run): rerun latex im idx file is empty (needed by memoir)
+        fix typo in comment (bug 2623).
+
+	* LaTeXFeatures.C (getPackages): whitespace.
+
 2006-05-22  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* BufferView_pimpl.C (getStatus): Disable saving of bookmarks in
diff --git a/src/LaTeX.C b/src/LaTeX.C
index 1d7f6f921a..298711edf3 100644
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -269,12 +269,17 @@ int LaTeX::run(TeXErrors & terr)
 	// the .aux file is checked for signs of bibtex. Bibtex is then run
 	// if needed.
 
+	// memoir (at least) writes an empty *idx file in the first place.
+	// A second latex run is needed.
+	rerun = fs::exists(ChangeExtension(file, ".idx"))
+		&& fs::is_empty(ChangeExtension(file, ".idx"));
+
 	// run makeindex
 	if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
 		// no checks for now
 		lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
 		message(_("Running MakeIndex."));
-		rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")), runparams);
+		rerun |= runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")), runparams);
 	}
 
 	// run bibtex
@@ -331,7 +336,7 @@ int LaTeX::run(TeXErrors & terr)
 
 	// 1.5
 	// The inclusion of files generated by external programs like
-	// makeindex or bibtex might have done changes to pagenumbereing,
+	// makeindex or bibtex might have done changes to pagenumbering,
 	// etc. And because of this we must run the external programs
 	// again to make sure everything is redone correctly.
 	// Also there should be no need to run the external programs any
diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index ed3969ce60..fdbdf764ab 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -293,7 +293,7 @@ string const LaTeXFeatures::getPackages() const
 
 	// makeidx.sty
 	if (isRequired("makeidx")) {
-		if (! tclass.provides(LyXTextClass::makeidx))
+		if (!tclass.provides(LyXTextClass::makeidx))
 			packages << "\\usepackage{makeidx}\n";
 		packages << "\\makeindex\n";
 	}
diff --git a/status.14x b/status.14x
index 932c062db3..f52ab906bd 100644
--- a/status.14x
+++ b/status.14x
@@ -72,6 +72,8 @@ What's new
 - Make jpeg graphics with suffix in capital letters (.JPG) work with
   pdflatex (bug 2235).
 
+- Fix LaTeX errors with memoir and makeindex (bug 2623).
+
 * Math editor:
 
 - Fix metrics of AMS array environments like bmatrix, vmatrix etc. (bug 2036).