diff --git a/ChangeLog b/ChangeLog
index 14e30ddcc4..0ab842154c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 27 21:41:29 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* strftime.c (rb_strftime): should add padding for %%.
+
 Thu Nov 27 16:32:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* signal.c (register_sigaltstack): stores alt stack for debug
diff --git a/strftime.c b/strftime.c
index 79c5fe4fa8..248c695e01 100644
--- a/strftime.c
+++ b/strftime.c
@@ -319,6 +319,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept
 			goto unknown;
 
 		case '%':
+			FILL_PADDING(1);
 			*s++ = '%';
 			continue;