diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index 5c4f66307ede..f0c7f4f2cfad 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -360,7 +360,8 @@ public class BuildManager implements ApplicationComponent{
 
   private void addMakeRequest(Runnable runnable) {
     myAlarm.cancelAllRequests();
-    myAlarm.addRequest(runnable, MAKE_TRIGGER_DELAY);
+    final int delay = Registry.intValue("compiler.automake.trigger.delay", MAKE_TRIGGER_DELAY);
+    myAlarm.addRequest(runnable, delay);
   }
 
   private void runAutoMake() {
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 6dab52896453..d6574da722da 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -164,6 +164,9 @@ compiler.process.use.external.javac.description=Run javac compiler in a separate
 
 compiler.process.debug.port=-1
 
+compiler.automake.trigger.delay=3000
+compiler.automake.trigger.delay.description=Delay in milliseconds before triggering auto-make in response to file system events
+
 vcs.show.colored.annotations=true
 vcs.showConsole=true