diff --git a/.fix-Changelog b/.fix-Changelog
index 9da1ce9..4bcb827 100644
--- a/.fix-Changelog
+++ b/.fix-Changelog
@@ -7,6 +7,7 @@
 for i in $FILES 
 do
 	echo $i
+	bk edit $i
 	cat $header $i > $i.new
 	mv $i.new $i
 done
diff --git a/ChangeLog b/ChangeLog
index 317d422..d55e591 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-11-08  Theodore Ts'o  <tytso@mit.edu>
 
+	* Release of E2fsprogs 1.31
+
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
 	* configure.in, configure: Change --enable-jfs-debug to 
 		--enable-jbd-debug for consistency's sake.
 
diff --git a/README b/README
index 51aa955..cf8ecfa 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-	This is the new version (1.30) of the second extended file
+	This is the new version (1.31) of the second extended file
 system management programs.
 
 	From time to time, I release new versions of e2fsprogs, to fix
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 232ee2c..2a7e1ba 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,43 @@
+E2fsprogs 1.31 (Nomvember 8, 2002)
+==================================
+
+Update EVMS ext2fsim plugin with EVMS 1.2.  (We still support
+compiling the fsim plugin with EVMS 1.0 and 1.1.)  Add better error
+handling for child process that die unexpectly.  Add a hack to force
+mkfs to create filesystems that won't cause problems with hardware
+that has 2k or 4k minimum blocksize requirements.  Read from child
+processes in non-blocking mode, so that the GUI continues to update.
+
+Fix e2fsck so that it returns the appropriate exit code when the root
+filesystem has been changed, so that system's rc scripts will be told that 
+the system needs to be rebooted.
+
+Fix a bug in ext2fs_flush/ext2fs_close; when the MASTER_SB_ONLY flag
+was set, some of the descriptor blocks that should have been written
+out were getting skipped.
+
+Changed e2fsck to force out changes to the backup copies of the
+superblock and block group descriptors when important changes are made
+to those data structures.
+
+Fix a bug where e2fsck could erroneously mark a filesystem as being
+clean if a check of dirty filesystem is interrupted with a ^C.  (Bug
+introduced in e2fsprogs 1.28.)
+
+If journal debuging is enabled using --enable-jbd-debug, the debugging
+level is now set via the E2FSCK_JBD_DEBUG environment variable.
+
+If byteswapping support is disabled using configure --disable-swapfs,
+skip the tests which depend on byte-swapping, so that "make check"
+won't bomb out.
+
+Lshattr will now display the indexed directory flag.  Also, some of
+the more esoteric compression flags are supressed unless compression
+support has been enabled.
+
+Update man pages.
+
+
 E2fsprogs 1.30 (October 31, 2002)
 =================================
 
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index e7dd1f0..0f37d45 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index 2d796e2..dcc9d0f 100644
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5bf7882..05dcc3d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index afa2d9e..4f45b7e 100644
--- a/doc/libext2fs.texinfo
+++ b/doc/libext2fs.texinfo
@@ -1,7 +1,7 @@
 \input texinfo    @c -*-texinfo-*-
 @c %**start of header
 @setfilename libext2fs.info
-@settitle The EXT2FS Library (version 1.30)
+@settitle The EXT2FS Library (version 1.31)
 @synindex tp fn
 @comment %**end of header
 
@@ -61,8 +61,8 @@
 
 @title The EXT2FS Library
 @subtitle The EXT2FS Library
-@subtitle Version 1.30
-@subtitle "October 2002
+@subtitle Version 1.31
+@subtitle "November 2002
 
 @author by Theodore Ts'o
 
@@ -102,7 +102,7 @@
 
 @top The EXT2FS Library
 
-This manual documents the EXT2FS Library, version 1.30.
+This manual documents the EXT2FS Library, version 1.31.
 
 @end ifinfo
 
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 80daf71..99381f7 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-11-08    <tytso@snap.thunk.org>
 
 	* unix.c (main): Fix a bug where e2fsck could erroneously mark a
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 0867889..aee2a21 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,6 +1,6 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
-Version: 1.30
+Version: 1.31
 Release: 0
 Copyright: GPL
 Group: System Environment/Base
diff --git a/ext2ed/ChangeLog b/ext2ed/ChangeLog
index b13d089..10ed598 100644
--- a/ext2ed/ChangeLog
+++ b/ext2ed/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/ext2ed/doc/ChangeLog b/ext2ed/doc/ChangeLog
index 0f3214d..44cd4fa 100644
--- a/ext2ed/doc/ChangeLog
+++ b/ext2ed/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/include/nonunix/ChangeLog b/include/nonunix/ChangeLog
index 73ca8db..c23c15b 100644
--- a/include/nonunix/ChangeLog
+++ b/include/nonunix/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/install-utils/ChangeLog b/install-utils/ChangeLog
index 61872ee..42e0a08 100644
--- a/install-utils/ChangeLog
+++ b/install-utils/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/intl/ChangeLog b/intl/ChangeLog
index b6849e3..38c4921 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 99d505a..c21135b 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index c446899..b53d3f8 100644
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,5 +1,9 @@
 2002-11-08  Theodore Ts'o  <tytso@mit.edu>
 
+	* Release of E2fsprogs 1.31
+
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
 	* pf.c: Print the indexed directory flag if present.  Don't
 		display all of the compression flags unless compression 
 		is enabled.
diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog
index 73b10fc..424c9dc 100644
--- a/lib/et/ChangeLog
+++ b/lib/et/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/lib/evms/ChangeLog b/lib/evms/ChangeLog
index 96dbd32..ee52262 100644
--- a/lib/evms/ChangeLog
+++ b/lib/evms/ChangeLog
@@ -1,5 +1,9 @@
 2002-11-08  Theodore Ts'o  <tytso@mit.edu>
 
+	* Release of E2fsprogs 1.31
+
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
 	* fs_ext2.c (fs_expand, fs_shrink), 
 	  fsimext2.c (fsim_mkfs, fsim_fsck): Inform the user if e2fsck, 
 		mke2fs or resize2fs dies with a signal, or if the exit 
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index da6ddbf..4ebc727 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-11-08    <tytso@snap.thunk.org>
 
 	* Makefile.in (check): Skip trying to compile test_byteswap
diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index 3de3c10..5de5bcd 100644
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index c683a52..7d9c180 100644
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/misc/ChangeLog b/misc/ChangeLog
index c201928..03cb92d 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,9 @@
 2002-11-08  Theodore Ts'o  <tytso@mit.edu>
 
+	* Release of E2fsprogs 1.31
+
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
 	* chattr.1.in: Update man page.
 
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
diff --git a/po/ChangeLog b/po/ChangeLog
index f2d4eb8..ab1b269 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/resize/ChangeLog b/resize/ChangeLog
index a722123..667c6a6 100644
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/tests/ChangeLog b/tests/ChangeLog
index c3c14cd..48ff857 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-11-08    <tytso@snap.thunk.org>
 
 	* f_swapfs: Skip the test if swapfs has been disabled via the
diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog
index fa82b22..a12a4d3 100644
--- a/tests/progs/ChangeLog
+++ b/tests/progs/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/util/ChangeLog b/util/ChangeLog
index 5e71b11..707c440 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.31
+
 2002-10-31  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.30
diff --git a/version.h b/version.h
index 28942dd..92d1ece 100644
--- a/version.h
+++ b/version.h
@@ -6,5 +6,5 @@
  * Ts'o.  This file may be redistributed under the GNU Public License.
  */
 
-#define E2FSPROGS_VERSION "1.30"
-#define E2FSPROGS_DATE "31-Oct-2002"
+#define E2FSPROGS_VERSION "1.31"
+#define E2FSPROGS_DATE "08-Nov-2002"