diff --git a/weechat-remove_build_timestamp.patch b/weechat-remove_build_timestamp.patch
deleted file mode 100644
index 20dfac3..0000000
--- a/weechat-remove_build_timestamp.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- src/core/wee-command.c.orig	2011-10-23 00:34:57.320000419 +0200
-+++ src/core/wee-command.c	2011-10-23 01:03:31.698000421 +0200
-@@ -4642,11 +4642,8 @@
-         if (translated_string)
-         {
-             snprintf (string, sizeof (string),
--                      "WeeChat %s [%s %s %s]",
--                      PACKAGE_VERSION,
--                      _("compiled on"),
--                      __DATE__,
--                      __TIME__);
-+                      "WeeChat %s",
-+                      PACKAGE_VERSION);
-             input_data (buffer, string);
-             if (weechat_upgrade_count > 0)
-             {
-@@ -4662,11 +4659,7 @@
-         else
-         {
-             snprintf (string, sizeof (string),
--                      "WeeChat %s [%s %s %s]",
--                      PACKAGE_VERSION,
--                      "compiled on",
--                      __DATE__,
--                      __TIME__);
-+                      "WeeChat %s", PACKAGE_VERSION);
-             input_data (buffer, string);
-             if (weechat_upgrade_count > 0)
-             {
-@@ -4682,15 +4675,9 @@
-     }
-     else
-     {
--        gui_chat_printf (NULL, "%sWeeChat %s %s[%s%s %s %s%s]",
-+        gui_chat_printf (NULL, "%sWeeChat %s",
-                          GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
--                         PACKAGE_VERSION,
--                         GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
--                         GUI_COLOR(GUI_COLOR_CHAT_VALUE),
--                         _("compiled on"),
--                         __DATE__,
--                         __TIME__,
--                         GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS));
-+                         PACKAGE_VERSION);
-         if (weechat_upgrade_count > 0)
-         {
-             gui_chat_printf (NULL,
---- src/core/weechat.c.orig	2011-10-23 00:59:56.544000420 +0200
-+++ src/core/weechat.c	2011-10-23 01:00:35.874000421 +0200
-@@ -114,11 +114,11 @@
-     string_iconv_fprintf (stdout, "\n");
-     string_iconv_fprintf (stdout,
-                           /* TRANSLATORS: "%s %s" after "compiled on" is date and time */
--                          _("WeeChat %s Copyright %s, compiled on %s %s\n"
-+                          _("WeeChat %s Copyright %s\n"
-                             "Developed by Sebastien Helleu <flashcode@flashtux.org> "
-                             "- %s"),
-                           PACKAGE_VERSION, WEECHAT_COPYRIGHT_DATE,
--                          __DATE__, __TIME__, WEECHAT_WEBSITE);
-+                          WEECHAT_WEBSITE);
-     string_iconv_fprintf (stdout, "\n");
- }
- 
---- src/core/wee-log.c.orig	2011-10-23 01:00:41.917000421 +0200
-+++ src/core/wee-log.c	2011-10-23 01:00:57.506000420 +0200
-@@ -115,8 +115,8 @@
-                                 "with another home using \"--dir\" command line option.\n"));
-         exit (1);
-     }
--    log_printf ("%s (%s %s %s)",
--                PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__);
-+    log_printf ("%s",
-+                PACKAGE_STRING);
- }
- 
- /*
---- src/core/wee-backtrace.c.orig	2011-10-23 00:59:39.654000420 +0200
-+++ src/core/wee-backtrace.c	2011-10-23 00:59:50.818000421 +0200
-@@ -160,8 +160,8 @@
- #endif
- 
-     weechat_backtrace_printf ("======= WeeChat backtrace =======");
--    weechat_backtrace_printf ("(written by %s, compiled on %s %s)",
--                              PACKAGE_STRING, __DATE__, __TIME__);
-+    weechat_backtrace_printf ("(written by %s)",
-+                              PACKAGE_STRING);
- 
- #ifdef HAVE_BACKTRACE
-     trace_size = backtrace (trace, BACKTRACE_MAX);
---- src/plugins/plugin-api.c.orig	2011-10-23 01:01:02.617000421 +0200
-+++ src/plugins/plugin-api.c	2011-10-23 01:01:20.814000421 +0200
-@@ -304,7 +304,7 @@
-     }
-     else if (string_strcasecmp (info_name, "date") == 0)
-     {
--        return __DATE__;
-+        return "";
-     }
-     else if (string_strcasecmp (info_name, "dir_separator") == 0)
-     {
diff --git a/weechat.changes b/weechat.changes
index b997c6e..69b0e4c 100644
--- a/weechat.changes
+++ b/weechat.changes
@@ -1,12 +1,31 @@
+-------------------------------------------------------------------
+Sun Oct 23 08:07:47 UTC 2011 - gber@opensuse.org
+
+- removed weechat-remove_build_timestamp.patch and use previous
+  code again to deal with timestamps
+
 -------------------------------------------------------------------
 Sat Oct 22 22:33:19 UTC 2011 - pascal.bleser@opensuse.org
 
 - update to 0.3.6:
-  * bold is not used any more for basic colors (used only if terminal has less
-    than 16 colors), a new option has been added to force bold if needed:
-    'weechat.look.color_basic_force_bold'
-  * option 'weechat.look.hline_char' has been renamed to
-    'weechat.look.separator_horizontal'
+  * mouse support
+  * cursor mode (free movement of cursor on screen)
+  * contexts for keys (default, search, cursor, mouse)
+  * hdata in API (direct access to WeeChat data)
+  * "inactive" colors for inactive windows and lines in merged
+     buffers
+  * support of merged buffers in /layout, save layout of
+    buffers/windows on /upgrade
+  * horizontal scrolling in buffers with free content
+  * split of outgoing IRC messages
+  * options for "more" chars in bars
+  * bold not used any more for basic colors (if terminal has more
+    than 16 colors)
+  * automatic zoom on current window when terminal becomes too
+    small for windows
+  * new command /repeat
+  * local variable "highlight_regex" in buffers
+- added weechat-remove_build_timestamp.patch
 
 -------------------------------------------------------------------
 Mon May 16 08:24:44 UTC 2011 - gber@opensuse.org
diff --git a/weechat.spec b/weechat.spec
index 4b3386c..b7982cd 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -24,7 +24,6 @@ Summary:        Portable, Fast, Light and Extensible Chat Client
 Source:         http://www.weechat.org/files/src/weechat-%{version}.tar.bz2
 Source1:        weechat.desktop
 Patch1:         weechat-0.3.3-fix-strftime.patch
-Patch2:         weechat-remove_build_timestamp.patch
 URL:            http://www.weechat.org
 Group:          Productivity/Networking/IRC
 License:        GNU General Public License (GPL)
@@ -108,7 +107,11 @@ Spell-checking support for %{name}, using the aspell library.
 %prep
 %setup -q
 %patch1 -p1
-%patch2
+modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
+DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
+TIME="\"$(date -d "${modified}" "+%%R")\""
+find .  -name '*.[ch]' |\
+    xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g"
 
 %build
 export CFLAGS="%{optflags}"