diff --git a/ChangeLog b/ChangeLog
index 6defe871..58d7b9fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
    closed.
  * plugins/classbuilder.c:
    Remove two unnecessary g_strdups().
+ * doc/geany.html, doc/geany.txt, src/keyfile.c, src/msgwindow.c,
+   src/plugindata.h, src/ui_utils.h:
+   Add hidden preference to disable automatic scrolling in the
+   Compiler tab (closes #3004714).
 
 
 2010-05-19  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
diff --git a/doc/geany.html b/doc/geany.html
index 55e8e10f..a6562888 100644
--- a/doc/geany.html
+++ b/doc/geany.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz" />
-<meta name="date" content="2010-05-06" />
+<meta name="date" content="$Date$" />
 <style type="text/css">
 
 /*
@@ -139,7 +139,7 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2010-05-06</td></tr>
+<td>$Date$</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.19</td></tr>
 </tbody>
@@ -4680,6 +4680,12 @@ buttons and menu items are always active
 and files can be saved.</td>
 <td>false</td>
 </tr>
+<tr><td>compiler_tab_autoscroll</td>
+<td>Whether to automatically scroll to the
+last line of the output in the Compiler
+tab.</td>
+<td>true</td>
+</tr>
 <tr><td><strong>VTE related</strong></td>
 <td>&nbsp;</td>
 <td>&nbsp;</td>
@@ -6091,7 +6097,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 <div class="footer">
 <hr class="footer" />
 <a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2010-05-16 18:24 UTC.
+Generated on: 2010-05-22 19:36 UTC.
 Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>
diff --git a/doc/geany.txt b/doc/geany.txt
index 9b4c1ae9..4d99b5b5 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -4035,6 +4035,9 @@ allow_always_save                 Whether files can be saved always, even if   f
                                   setting this option to true, the Save
                                   buttons and menu items are always active
                                   and files can be saved.
+compiler_tab_autoscroll           Whether to automatically scroll to the       true
+                                  last line of the output in the Compiler
+                                  tab.
 **VTE related**
 emulation                         Terminal emulation mode. Only change this    xterm
                                   if you have VTE termcap files other than
diff --git a/src/keyfile.c b/src/keyfile.c
index e2a9ee6f..2f976f92 100644
--- a/src/keyfile.c
+++ b/src/keyfile.c
@@ -189,6 +189,8 @@ static void init_pref_groups(void)
 		"complete_snippets_whilst_editing", FALSE);
 	stash_group_add_boolean(group, &interface_prefs.show_symbol_list_expanders,
 		"show_symbol_list_expanders", TRUE);
+	stash_group_add_boolean(group, &interface_prefs.compiler_tab_autoscroll,
+		"compiler_tab_autoscroll", TRUE);
 	stash_group_add_boolean(group, &ui_prefs.allow_always_save,
 		"allow_always_save", FALSE);
 	stash_group_add_boolean(group, &file_prefs.use_safe_file_saving,
diff --git a/src/msgwindow.c b/src/msgwindow.c
index 4587da66..efd3b32d 100644
--- a/src/msgwindow.c
+++ b/src/msgwindow.c
@@ -272,7 +272,7 @@ void msgwin_compiler_add_string(gint msg_color, const gchar *msg)
 	gtk_list_store_append(msgwindow.store_compiler, &iter);
 	gtk_list_store_set(msgwindow.store_compiler, &iter, 0, color, 1, msg, -1);
 
-	if (ui_prefs.msgwindow_visible)
+	if (ui_prefs.msgwindow_visible && interface_prefs.compiler_tab_autoscroll)
 	{
 		path = gtk_tree_model_get_path(
 			gtk_tree_view_get_model(GTK_TREE_VIEW(msgwindow.tree_compiler)), &iter);
diff --git a/src/plugindata.h b/src/plugindata.h
index 396f960b..4e89d6d0 100644
--- a/src/plugindata.h
+++ b/src/plugindata.h
@@ -50,7 +50,7 @@
 enum {
 	/** The Application Programming Interface (API) version, incremented
 	 * whenever any plugin data types are modified or appended to. */
-	GEANY_API_VERSION = 186,
+	GEANY_API_VERSION = 187,
 
 	/** The Application Binary Interface (ABI) version, incremented whenever
 	 * existing fields in the plugin data types have to be changed or reordered. */
diff --git a/src/ui_utils.h b/src/ui_utils.h
index 21f02858..bdcc46fc 100644
--- a/src/ui_utils.h
+++ b/src/ui_utils.h
@@ -58,6 +58,7 @@ typedef struct GeanyInterfacePrefs
 	gboolean		msgwin_messages_visible;
 	gboolean		msgwin_scribble_visible;
 	gboolean		use_native_windows_dialogs; /* only used on Windows */
+	gboolean		compiler_tab_autoscroll;
 }
 GeanyInterfacePrefs;