--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,31 @@
 
+Changes with nginx 0.5.36                                        04 May 2008
+
+    *) Bugfix: the "sub_filter" directive might set text to change into 
+       output.
+
+    *) Bugfix: a segmentation fault occurred in worker process, if empty 
+       stub block was used second time in SSI.
+
+    *) Bugfix: the "proxy_store" and "fastcgi_store" directives did not 
+       check a response length.
+
+    *) Bugfix: nginx issued the bogus error message "SSL_shutdown() failed 
+       (SSL: )"; bug appeared in 0.5.35.
+
+    *) Bugfix: in HTTPS mode requests might fail with the "bad write retry" 
+       error; bug appeared in 0.5.35.
+
+    *) Bugfix: the "fastcgi_catch_stderr" directive did return error code; 
+       now it returns 502 code, that can be rerouted to a next server using 
+       the "fastcgi_next_upstream invalid_header" directive.
+
+    *) Bugfix: a segmentation fault occurred in master process if the 
+       "fastcgi_catch_stderr" directive was used; bug appeared in 
+       0.5.32.
+       Thanks to Manlio Perillo.
+
+
 Changes with nginx 0.5.35                                        08 Jan 2008
 
     *) Change: now the ngx_http_userid_module adds start time microseconds 
@@ -344,7 +371,8 @@ Changes with nginx 0.5.20               
        Studio.
        Thanks to Andrei Nigmatulin.
 
-    *) Bugfix: the ngx_http_perl_module could not built by Solaris make.
+    *) Bugfix: the ngx_http_perl_module could not be built by Solaris 
+       make.
        Thanks to Andrei Nigmatulin.