diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 0bd7da7d53..eee24b6263 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-07  John Levon  <levon@movementarian.org>
+
+	* lyx_gui.C: delete lyxserver on exit path (bug 865)
+
 2003-02-07  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
 
 	* QTabular.C (closeGUI): do not change if nothing has to 
diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C
index d5eca643e5..b9d4c7ae77 100644
--- a/src/frontends/qt2/lyx_gui.C
+++ b/src/frontends/qt2/lyx_gui.C
@@ -170,11 +170,15 @@ void lyx_gui::start(string const & batch, vector<string> const & files)
 
 	// FIXME
 	delete lyxserver;
+	lyxserver = 0;
 }
 
 
 void lyx_gui::exit()
 {
+	delete lyxserver;
+	lyxserver = 0;
+
 	// we cannot call qApp->exit(0) - that could return us
 	// into a static dialog return in the lyx code (for example,
 	// load autosave file QMessageBox. We have to just get the hell