diff --git a/README b/README
index 2e4c26a..367b3ab 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-	This is the new version (1.17) of the second extended file system
-management programs.
+	This is the new version (1.18) of the second extended file
+system management programs.
 
 	From time to time, I release new versions of e2fsprogs, to fix
 bugs and to make the utilities more robust.  You can always find
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5b0ea15..7eb0023 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,49 @@
+E2fsprogs 1.18 (November 10, 1999)
+==================================
+
+Fix a core dumping bug in e2fsck if an imagic inode is present or
+(more rarely) if the filesystem is badly corrupted enough that e2fsck
+has to restart pass 1 processing.  E2fsck now closes the filesystem
+before freeing a large number of its data structures, so in the case
+of future memory faults, at least the fixed filesystem will be fully
+written out.
+
+If a filesystem doesn't support imagic inodes, and e2fsck discovers an
+imagic inode, it will offer to clear the imagic flag.
+
+E2fsck will now offer to clear the immutable flag on special files
+(device/socket/fifos) when running it in non-preen mode.
+
+E2fsck will now set the filetype when creating /lost+found, and when
+connected orphaned inodes to /lost+found.
+
+Debugfs's ncheck and icheck commands now handles the case where there
+are bad blocks in the inode table without bombing out.
+
+The badblocks list processing code has been made more efficiently for
+appending a large number of (ordered) badblocks to the badblocks list.
+
+Some minor man page updates.
+
+Fsck now allows interactive e2fsck's when using fsck -As (not a common
+mode, but some people like to do this in boot scripts for silly reasons).
+
+Programmer's notes:
+-------------------
+
+The internal e2fsck problem code for PR_2_SPLIT_DOT was fixed to meet
+with the problem code convention.
+
+The badblocks list regression test program has been updated to work
+with previously made API name changes.
+
+The ext2fs_free() command now uses the new badblocks API to avoid
+using the compatibility layer.
+
+Added new regression test cases; the run_e2fsck test script now
+supports the ability for a test case to run a prepratory command
+before running e2fsck.
+
 E2fsprogs 1.17 (October 26, 1999)
 =================================
 
diff --git a/TODO b/TODO
index 6deba2e..0799a28 100644
--- a/TODO
+++ b/TODO
@@ -52,3 +52,11 @@
 fix up get_backup_sb, so that it doesn't choose something bogus if
 fs->super->.... is ridiculous
 
+----------------------------------
+
+Maybe a bug in debugfs v.1.14:
+if a file has more than one hardlink, only the first filename is shown when
+using command
+        ncheck <inode>
+
+------------------------------------
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 823eef6..5e14821 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,10 +1,10 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
-Version: 1.17
+Version: 1.18
 Release: 0
 Copyright: GPL
 Group: System Environment/Base
-Source: ftp://tsx-11.mit.edu/pub/linux/packages/ext2fs/e2fsprogs-1.17.tar.gz
+Source: ftp://tsx-11.mit.edu/pub/linux/packages/ext2fs/e2fsprogs-1.18.tar.gz
 BuildRoot: /tmp/e2fsprogs-root
 
 %description
diff --git a/version.h b/version.h
index 21bc489..f713069 100644
--- a/version.h
+++ b/version.h
@@ -6,5 +6,5 @@
  * may be redistributed under the GNU Public License.
  */
 
-#define E2FSPROGS_VERSION "1.17"
-#define E2FSPROGS_DATE "26-Oct-1999"
+#define E2FSPROGS_VERSION "1.18"
+#define E2FSPROGS_DATE "11-Nov-1999"