diff --git a/war/src/main/js/config-tabbar.js b/war/src/main/js/config-tabbar.js
index 8d7bd3466292793d5cdf03cdabe0434df28ed18c..96225d88587a52a42e09b15245ef638fac562bfe 100644
--- a/war/src/main/js/config-tabbar.js
+++ b/war/src/main/js/config-tabbar.js
@@ -25,6 +25,13 @@ $(function() {
                     var configTable = $(this);
                     var tabBar = tabBarWidget.addTabs(configTable);
 
+                    // We want to merge some sections together.
+                    // Merge the "Advanced" section into the "General" section.
+                    var generalSection = tabBar.getSection('config_general');
+                    if (generalSection) {
+                        generalSection.adoptSection('config_advanced_project_options');
+                    }
+                    
                     addFinderToggle(tabBar);
                     tabBar.onShowSection(function() {
                         // Hook back into hudson-behavior.js