diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index bbcd867474..dd54a61e2e 100644
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-12  Bernhard Reiter  <ockham@gmx.net>
+
+	* The Thesaurus dialog
+	* GThesaurus.C, GThesaurus.h, Makefile.am
+	* Dialogs.C: moved BC generation to individual if blocks
+	* glade/thesaurus.glade, glade/Makefile.am
+
 2005-10-02  Martin Vermeer  <martin.vermeer@hut.fi>
 
 	* GToc.C: fix bug 2038
diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C
index a9fa419d24..2c23bc8a32 100644
--- a/src/frontends/gtk/Dialogs.C
+++ b/src/frontends/gtk/Dialogs.C
@@ -100,7 +100,7 @@
 
 #ifdef HAVE_LIBAIKSAURUS
 #include "ControlThesaurus.h"
-#include "FormThesaurus.h"
+#include "GThesaurus.h"
 #endif
 
 #include "xformsBC.h"
@@ -520,8 +520,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
 		dialog->bc().bp(new OkCancelPolicy);
 #ifdef HAVE_LIBAIKSAURUS
 	} else if (name == "thesaurus") {
+		dialog->bc().view(new GBC(dialog->bc()));
 		dialog->setController(new ControlThesaurus(*dialog));
-		dialog->setView(new FormThesaurus(*dialog));
+		dialog->setView(new GThesaurus(*dialog));
 		dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
 #endif
 	} else if (name == "toc") {
diff --git a/src/frontends/gtk/Makefile.am b/src/frontends/gtk/Makefile.am
index 24ae7268e4..dcccffb866 100644
--- a/src/frontends/gtk/Makefile.am
+++ b/src/frontends/gtk/Makefile.am
@@ -89,6 +89,8 @@ libgtk_la_SOURCES = \
 	GTexinfo.h \
 	GText.C \
 	GText.h \
+	GThesaurus.C \
+	GThesaurus.h \
 	GTimeout.C \
 	GTimeout.h \
 	GToc.C \
@@ -148,7 +150,6 @@ xforms_objects = \
 	../xforms/forms_gettext.lo \
 	../xforms/FormTabular.lo \
 	../xforms/FormText.lo \
-	../xforms/FormThesaurus.lo \
 	../xforms/FormWrap.lo \
 	../xforms/freebrowser.lo \
 	../xforms/input_validators.lo \
diff --git a/src/frontends/gtk/glade/Makefile.am b/src/frontends/gtk/glade/Makefile.am
index 7e32022ee3..e5d2cc25b1 100644
--- a/src/frontends/gtk/glade/Makefile.am
+++ b/src/frontends/gtk/glade/Makefile.am
@@ -29,6 +29,7 @@ dist_glade_DATA = \
 	tableCreate.glade \
 	texinfo.glade \
 	text.glade \
+	thesaurus.glade \
 	toc.glade \
 	url.glade \
 	vspace.glade