diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4d6640..87acf44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Master
+
+- [Issue #85](https://github.com/netzpirat/guard-jasmine/issues/85): Improve server timeout handling.
+
 ## 1.9.1 - October 17, 2012
 
 - Fix automatic server detection.
diff --git a/lib/guard/jasmine/server.rb b/lib/guard/jasmine/server.rb
index a1e948d..95e99ff 100644
--- a/lib/guard/jasmine/server.rb
+++ b/lib/guard/jasmine/server.rb
@@ -137,7 +137,8 @@ def wait_for_server(port, timeout)
           end
           
         rescue Timeout::Error
-          ::Guard::UI.warning 'Timeout while waiting for the server startup.'
+          ::Guard::UI.warning 'Timeout while waiting for the server startup. You may need to increase the `:server_timeout` option.'
+          throw :task_has_failed
         end
 
       end