diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 5708b30fdd..2b6eaa2feb 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-19  Angus Leeming  <leeming@lyx.org>
+
+	* lyx_gui.C (LApplication d-tor): remove code to unlock
+	  QApplication mutex as we didn't lock the thing in the
+	  first place; undefined behaviour.
+
 2005-09-15  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* QCitationDialog.C (find): correct start iterator when searching
diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C
index e82c786269..ee18d0a95f 100644
--- a/src/frontends/qt2/lyx_gui.C
+++ b/src/frontends/qt2/lyx_gui.C
@@ -121,12 +121,7 @@ LQApplication::LQApplication(int & argc, char ** argv)
 
 
 LQApplication::~LQApplication()
-{
-#ifdef QT_THREAD_SUPPORT
-	if (locked())
-		unlock();
-#endif
-}
+{}
 
 
 #ifdef Q_OS_MAC
diff --git a/status.13x b/status.13x
index ee7fed44c1..0f90e56ed2 100644
--- a/status.13x
+++ b/status.13x
@@ -56,6 +56,9 @@ What's new
 
 - Add key bindings for "primary-selection-paste"
 
+- On exit, don't attempt to unlock a mutex in the Qt library --- it
+  causes undefined behaviour and leads to a crash on NetBSD.
+
 * Configuration/Installation:
 
 - Enable TeXFiles.sh to run when its path contains spaces.