Release 3.6.25.
diff --git a/ChangeLog b/ChangeLog
index df0611b..8c1b10f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2016-06-06
+ 3.6.25 release.
+ reiserfsprogs: use com_err in reiserfs_open
+ reiserfscore: fix "new_insert_key may be used uninitialized..."
+ reiserfsprogs: fix issues with inline functions
+ man: Fixes a little glitch in the man page.
+ manpages: escape dashes
+ fsck: remove namesys.com reference in error text
+ reiserfscore: constify struct pointer arguments
+ reiserfscore: constify strings
+ reiserfslib: add basic extended attribute helpers
+ reiserfslib: add file data and directory iterators
+ mkreiserfs: move block_size_ok out of reiserfscore
+ debugreiserfs: fix incorrect memset size in unpack_stat_data
+ reiserfsprogs: remove dead code
+ debugreiserfs: fix use after free while closing log
+ reiserfsprogs: add helpers for constant endian routines
+ build: introduce shared libreiserfscore.so and export it
+ reiserfsprogs: convert reiserfs_filsys_t from structure to pointer-to-structure
+ reiserfsprogs: annotate for endian safeness
+ reiserfsprogs: fix remaining sparse warnings
+ reiserfsprogs: Fix sparse "warning: Using plain integer as NULL pointer"
+ sparse: move bitops functions to include/misc.h
+ reiserfscore: rename usearch_by_position to reiserfs_search_by_position
+ reiserfscore: make reiserfs_open's filename argument const
+ swab: protect le32_to_cpu and friends against being defined twice
+ reiserfs_fs.h: Eliminate overlays in offset_v2 helpers
+ reiserfscore: move endian helpers for offset_v2 into header
+ reiserfs_fs.h: Fix ifndef for multiple inclusion
+ cleanup: remove unused argument to reiserfs_invalidate_buffer
+ cleanup: remove dead code
+ cleanup: remove unnecessary fs pointer passed with buffer_infos
+ cleanup: factor out buffer_info initialization into helpers
+ cleanup: rename key and item_head accessors to more friendly names
+ cleanup: remove trailing whitespace
+ cleanup: run indent with the Linux Kernel style across all code
+ cleanup: rename common structure names
2013-08-25
3.6.24 release.
reiserfsprogs: autogenerate the version number in the man pages
diff --git a/configure.ac b/configure.ac
index 44db257..b975f19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([reiserfsprogs], [3.6.24], [reiserfs-devel@vger.kernel.org])
+AC_INIT([reiserfsprogs], [3.6.25], [reiserfs-devel@vger.kernel.org])
AC_CANONICAL_HOST
AC_PREREQ(2.50)
