diff --git a/fvwm-2.5.24.tar.bz2 b/fvwm-2.5.24.tar.bz2
deleted file mode 100644
index 9b21e21..0000000
--- a/fvwm-2.5.24.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9aa11c80de59043a33cf1da8130fe76c7ba5557fc7517b00822472e4fb7accc1
-size 2513796
diff --git a/fvwm-2.5.24-charset_in_title.patch b/fvwm-2.5.25-charset_in_title.patch
similarity index 100%
rename from fvwm-2.5.24-charset_in_title.patch
rename to fvwm-2.5.25-charset_in_title.patch
diff --git a/fvwm-2.5.24-gcc-warnings.patch b/fvwm-2.5.25-gcc-warnings.patch
similarity index 100%
rename from fvwm-2.5.24-gcc-warnings.patch
rename to fvwm-2.5.25-gcc-warnings.patch
diff --git a/fvwm-2.5.24-ia64.patch b/fvwm-2.5.25-ia64.patch
similarity index 100%
rename from fvwm-2.5.24-ia64.patch
rename to fvwm-2.5.25-ia64.patch
diff --git a/fvwm-2.5.24-sv_SE.patch b/fvwm-2.5.25-sv_SE.patch
similarity index 100%
rename from fvwm-2.5.24-sv_SE.patch
rename to fvwm-2.5.25-sv_SE.patch
diff --git a/fvwm-2.5.24-utf_encoding.patch b/fvwm-2.5.25-utf_encoding.patch
similarity index 100%
rename from fvwm-2.5.24-utf_encoding.patch
rename to fvwm-2.5.25-utf_encoding.patch
diff --git a/fvwm-2.5.25.tar.bz2 b/fvwm-2.5.25.tar.bz2
new file mode 100644
index 0000000..01b237b
--- /dev/null
+++ b/fvwm-2.5.25.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:212dafb5fbace4a72d7a2d2dd6df7445709bad6739162a72879e4a6e942d69fc
+size 2516717
diff --git a/fvwm2.changes b/fvwm2.changes
index 033a114..b2a20de 100644
--- a/fvwm2.changes
+++ b/fvwm2.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Wed Feb 27 10:59:15 CET 2008 - lmichnovic@suse.cz
+
+- update to version 2.5.25
+ * New features:
+  - Handle the STATE_ADD command of the EWMH _NET_WM_STATE
+    message from version 1.3 of the EWMH spec.
+  - Support transparency in ARGB windows
+ * Bug Fixes:
+  - Fixed problem with windows disappearing when created
+    unless the style Unmanaged was used.
+  - Edge move delay was used as resistance for the top edge.
+  - Fixed a parsing problem of the screen argument of the
+    SnapAttraction style.
+  - Some html documentation files were not installed.
+  - Fixed a memory leak in internationalized font handling.
+  - Fixed a bug in MinOverlap placement.
+  - Fixed the StickyAcrossPages style in the FvwmPager.
+  - Fixed the determination of the X charset on UTF-8 systems.
+  - Fixed a crash when certain EWMH messages were sent to
+    unmanaged windows.
+  - Fixed a memory leak in multibyte codepage code.
+  - Ignore the EWMH staysontop and staysonbottom hints if the
+    EWMHIgnoreStackingOrderHints style is used.
+  - Fixed a sporadic crash when the root background set by gnome,
+    fvwm-root, esetroot etc. changes and a root transparent
+    colour set is used.
+  - Fixed spradic crash in modules with root transparent
+    background from colour sets.
+  - Fixed a possible crash if the last active module fails.
+
 -------------------------------------------------------------------
 Wed Jan 30 16:10:05 CET 2008 - lmichnovic@suse.cz
 
diff --git a/fvwm2.spec b/fvwm2.spec
index b7d9e8b..b2a1059 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package fvwm2 (Version 2.5.24)
+# spec file for package fvwm2 (Version 2.5.25)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+
 Name:           fvwm2
 BuildRequires:  freetype2-devel fribidi-devel gcc-c++ gnome-libs-devel gtk-devel gtkdoc imlib-config imlib-devel libpng-devel libstroke-devel pkgconfig readline-devel update-desktop-files
 License:        GPL v2 or later
@@ -17,11 +18,11 @@ Group:          System/GUI/Other
 Provides:       fvwm fvwmicns windowmanager xpmroot
 Obsoletes:      fvwm xpmroot
 AutoReqProv:    on
-Version:        2.5.24
-Release:        7
+Version:        2.5.25
+Release:        1
 Summary:        Improved Version of FVWM Window Manager
 Url:            http://www.fvwm.org
-Source0:        fvwm-2.5.24.tar.bz2
+Source0:        fvwm-%{version}.tar.bz2
 Source1:        fvwm_icons.tar.bz2
 Source3:        %name.desktop
 Source4:        system.fvwm2rc
@@ -84,12 +85,11 @@ Authors:
 %endif
 
 %prep
-%setup -q -n fvwm-2.5.24
+%setup -q -n fvwm-%{version}
 %patch0
 %patch1
 %patch2
 %patch3
-%patch4
 %patch5
 find . -name *sv_SE* |xargs rename sv_SE sv  
 mkdir icons
@@ -211,6 +211,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/%{_xorg7libs32}/X11/fvwm2/FvwmGtk*
 
 %changelog
+* Wed Feb 27 2008 lmichnovic@suse.cz
+- update to version 2.5.25
+  * New features:
+  - Handle the STATE_ADD command of the EWMH _NET_WM_STATE
+  message from version 1.3 of the EWMH spec.
+  - Support transparency in ARGB windows
+  * Bug Fixes:
+  - Fixed problem with windows disappearing when created
+  unless the style Unmanaged was used.
+  - Edge move delay was used as resistance for the top edge.
+  - Fixed a parsing problem of the screen argument of the
+  SnapAttraction style.
+  - Some html documentation files were not installed.
+  - Fixed a memory leak in internationalized font handling.
+  - Fixed a bug in MinOverlap placement.
+  - Fixed the StickyAcrossPages style in the FvwmPager.
+  - Fixed the determination of the X charset on UTF-8 systems.
+  - Fixed a crash when certain EWMH messages were sent to
+  unmanaged windows.
+  - Fixed a memory leak in multibyte codepage code.
+  - Ignore the EWMH staysontop and staysonbottom hints if the
+  EWMHIgnoreStackingOrderHints style is used.
+  - Fixed a sporadic crash when the root background set by gnome,
+  fvwm-root, esetroot etc. changes and a root transparent
+  colour set is used.
+  - Fixed spradic crash in modules with root transparent
+  background from colour sets.
+  - Fixed a possible crash if the last active module fails.
 * Wed Jan 30 2008 lmichnovic@suse.cz
 - adjusted system.fvwm2rc and _system.fvwm2rc files
   * checked and fixed menu entries