diff --git a/ChangeLog b/ChangeLog
index aa2d6fd006..985484d2aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-05-21  Christian Stimming  <stimming@tuhh.de>
 
+	* src/gnome/gnc-plugin-basic-commands.c,
+	src/gnome/ui/gnc-plugin-basic-commands-ui.xml: Hide the "QSF
+	Import" for the 2.0.0 release because it is not yet finished. Can
+	be activated again in the next developing HEAD branch.
+
 	* po/ro.po: Initial Romanian translation by Danny Fischer
 	<dan.pescaru@gmail.com>
 
diff --git a/src/gnome/gnc-plugin-basic-commands.c b/src/gnome/gnc-plugin-basic-commands.c
index cf7495b516..e9f4fcc119 100644
--- a/src/gnome/gnc-plugin-basic-commands.c
+++ b/src/gnome/gnc-plugin-basic-commands.c
@@ -56,7 +56,9 @@
 #include "gnc-session.h"
 
 /* This static indicates the debugging module that this .o belongs to.  */
+#ifdef QSF_IMPORT_NO_LONGER_BROKEN
 static QofLogModule log_module = GNC_MOD_GUI;
+#endif
 
 static void gnc_plugin_basic_commands_class_init (GncPluginBasicCommandsClass *klass);
 static void gnc_plugin_basic_commands_init (GncPluginBasicCommands *plugin);
@@ -67,7 +69,9 @@ static void gnc_main_window_cmd_file_new (GtkAction *action, GncMainWindowAction
 static void gnc_main_window_cmd_file_open (GtkAction *action, GncMainWindowActionData *data);
 static void gnc_main_window_cmd_file_save (GtkAction *action, GncMainWindowActionData *data);
 static void gnc_main_window_cmd_file_save_as (GtkAction *action, GncMainWindowActionData *data);
+#ifdef QSF_IMPORT_NO_LONGER_BROKEN
 static void gnc_main_window_cmd_file_qsf_import (GtkAction *action, GncMainWindowActionData *data);
+#endif
 static void gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindowActionData *data);
 static void gnc_main_window_cmd_file_chart_export (GtkAction *action, GncMainWindowActionData *data);
 static void gnc_main_window_cmd_edit_tax_options (GtkAction *action, GncMainWindowActionData *data);
@@ -104,10 +108,12 @@ static GtkActionEntry gnc_plugin_actions [] = {
   { "FileSaveAsAction", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<shift><control>s",
     NULL,
     G_CALLBACK (gnc_main_window_cmd_file_save_as) },
+#ifdef QSF_IMPORT_NO_LONGER_BROKEN
   { "FileImportQSFAction", GTK_STOCK_CONVERT,
     N_("_QSF Import"), NULL,
     N_("Import a QSF object file"),
     G_CALLBACK (gnc_main_window_cmd_file_qsf_import) },
+#endif
   { "FileExportAccountsAction", GTK_STOCK_CONVERT,
     N_("Export _Accounts"), NULL,
     N_("Export the account hierarchy to a new GnuCash datafile"),
@@ -345,7 +351,7 @@ gnc_main_window_cmd_file_save_as (GtkAction *action, GncMainWindowActionData *da
   gnc_window_set_progressbar_window (NULL);
   /* FIXME GNOME 2 Port (update the title etc.) */
 }
-
+#ifdef QSF_IMPORT_NO_LONGER_BROKEN
 static void
 qsf_file_select_ok(GtkWidget *w, GtkFileSelection *fs )
 {
@@ -383,7 +389,7 @@ gnc_main_window_cmd_file_qsf_import (GtkAction *action, GncMainWindowActionData
   gtk_widget_show (file_select);
   gnc_window_set_progressbar_window(NULL);
 }
-
+#endif
 static void
 gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindowActionData *data)
 {
diff --git a/src/gnome/ui/gnc-plugin-basic-commands-ui.xml b/src/gnome/ui/gnc-plugin-basic-commands-ui.xml
index df090458c7..8ef61c9cb2 100644
--- a/src/gnome/ui/gnc-plugin-basic-commands-ui.xml
+++ b/src/gnome/ui/gnc-plugin-basic-commands-ui.xml
@@ -15,9 +15,9 @@
         <menuitem name="FileSave" action="FileSaveAction"/>
         <menuitem name="FileSaveAs" action="FileSaveAsAction"/>
       </placeholder>
-      <menu name="FileImport" action="FileImportAction">
+      <!-- menu name="FileImport" action="FileImportAction">
         <menuitem name="FileImportQSF" action="FileImportQSFAction"/>
-      </menu>
+      </menu -->
       <menu name="FileExport" action="FileExportAction">
         <menuitem name="FileExportAccounts" action="FileExportAccountsAction"/>
         <menuitem name="FileExportChart" action="FileExportChartAction"/>