diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 39f270396e4409383c11f4495354023ec0f6e081..04cd399b090abf37542b568f89c81495510a52a1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-07-30  Jakob Petsovits  <jakob.petsovits@torchmobile.com>
+
+         Reviewed by Adam Roben.
+
+         Add --minimal option to webkit-build.
+         https://bugs.webkit.org/show_bug.cgi?id=27852
+
+         This option disables all optional build features unless
+         they are explicitly enabled.
+
+         * Scripts/build-webkit:
+
 2009-07-30  Jakub Wieczorek  <faw217@gmail.com>
 
         [Qt] Fix build with GCC 4.4.
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index 9445f2990c3319631688fc5adfca6586cab5272f..3b10358d06a0c828c0fdc3c1048ce5a4c4d25256 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -42,6 +42,7 @@ chdirWebKit();
 
 my $showHelp = 0;
 my $clean = 0;
+my $minimal = 0;
 my $makeArgs;
 
 my ($threeDRenderingSupport, $channelMessagingSupport, $databaseSupport, $domStorageSupport,
@@ -139,9 +140,17 @@ if (isQt()) {
     }
 }
 
+# Initialize values from defaults
+foreach (@ARGV) {
+    if ($_ eq '--minimal') {
+        $minimal = 1;
+        last;
+    }
+}
+
 # Initialize values from defaults
 foreach (@features) {
-    ${$_->{value}} = $_->{default} || 0;
+    ${$_->{value}} = ($_->{default} && !$minimal) || 0;
 }
 
 $svgSupport = $svgSupport || $svgAnimationSupport || $svgAsImageSupport
@@ -162,19 +171,22 @@ Usage: $programName [options] [options to pass to build system]
 
   --makeargs=<arguments>            Optional Makefile flags
 
+  --minimal                         No optional features, unless explicitly enabled.
+
 EOF
 
 my %options = (
     'help' => \$showHelp,
     'clean' => \$clean,
     'makeargs=s' => \$makeArgs,
+    'minimal' => \$minimal,
 );
 
 # Build usage text and options list from features
 foreach (@features) {
     my $opt = sprintf("%-35s", "  --[no-]$_->{option}");
-    $usage .= "$opt $_->{desc} (default: ${$_->{value}})\n";
-    $options{"$_->{option}!"} =  $_->{value};
+    $usage .= "$opt $_->{desc} (default: $_->{default})\n";
+    $options{"$_->{option}!"} = $_->{value};
 }
 
 GetOptions(%options);