diff --git a/src/ChangeLog b/src/ChangeLog
index 75813acc..1e144956 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-29  Giuseppe Scrivano  <gscrivan@redhat.com>
+
+	* warc.c (warc_write_date_header): Avoid out-of-scope variable usage.
+
 2014-06-28  Giuseppe Scrivano  <gscrivan@redhat.com>
 
 	* Makefile.am (wget_SOURCES): Remove space-tab indentation.
diff --git a/src/warc.c b/src/warc.c
index 34613ec3..46459acd 100644
--- a/src/warc.c
+++ b/src/warc.c
@@ -386,9 +386,9 @@ warc_write_end_record (void)
 static bool
 warc_write_date_header (const char *timestamp)
 {
+  char current_timestamp[21];
   if (timestamp == NULL)
     {
-      char current_timestamp[21];
       warc_timestamp (current_timestamp);
       timestamp = current_timestamp;
     }