diff --git a/ChangeLog b/ChangeLog
index b83cb1cb..d1a696cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+12/02/2003 - 1.7.0 - Small bug fixes and updates.
+	- Bug fixes in mapping pairs array generation in libntfs.
+	- Bug fixes and updates in ntfsresize. (Szabolcs Szakacsits)
+	- Tidyups and standardisations. (Richard Russon)
+
 18/01/2003 - 1.7.0beta - Library rewrite and many new tools.
 	- Highlights of this release are the now hopefully stable API sported
 	  by an almost completely rewritten library and the new utilities;
diff --git a/configure b/configure
index 60fe1ffa..1ccba2b8 100755
--- a/configure
+++ b/configure
@@ -966,7 +966,7 @@ fi
 
 PACKAGE=ntfsprogs
 
-VERSION=1.7.0beta
+VERSION=1.7.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff --git a/configure.in b/configure.in
index 39ee66ea..3e823ca9 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ fi
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(ntfsprogs,1.7.0beta)
+AM_INIT_AUTOMAKE(ntfsprogs,1.7.0)
 
 AM_MAINTAINER_MODE
 
diff --git a/ntfsprogs/Makefile.in b/ntfsprogs/Makefile.in
index 59316865..fc189524 100644
--- a/ntfsprogs/Makefile.in
+++ b/ntfsprogs/Makefile.in
@@ -174,62 +174,62 @@ PROGRAMS =  $(bin_PROGRAMS) $(sbin_PROGRAMS)
 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 LIBS = @LIBS@
 ntfsdump_logfile_OBJECTS =  ntfsdump_logfile.$(OBJEXT)
-@REALLYSTATIC_TRUE@ntfsdump_logfile_DEPENDENCIES =  \
-@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
 @REALLYSTATIC_FALSE@ntfsdump_logfile_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
-dumplog_OBJECTS =  dumplog.$(OBJEXT)
-@REALLYSTATIC_TRUE@dumplog_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@ntfsdump_logfile_DEPENDENCIES =  \
 @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
+dumplog_OBJECTS =  dumplog.$(OBJEXT)
 @REALLYSTATIC_FALSE@dumplog_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
-ntfswipe_OBJECTS =  ntfswipe.$(OBJEXT) utils.$(OBJEXT)
-@REALLYSTATIC_TRUE@ntfswipe_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@dumplog_DEPENDENCIES =  \
 @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
+ntfswipe_OBJECTS =  ntfswipe.$(OBJEXT) utils.$(OBJEXT)
 @REALLYSTATIC_FALSE@ntfswipe_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
+@REALLYSTATIC_TRUE@ntfswipe_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
 ntfstruncate_OBJECTS =  attrdef.$(OBJEXT) ntfstruncate.$(OBJEXT) \
 utils.$(OBJEXT)
-@REALLYSTATIC_TRUE@ntfstruncate_DEPENDENCIES =  \
-@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
 @REALLYSTATIC_FALSE@ntfstruncate_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
-ntfscluster_OBJECTS =  ntfscluster.$(OBJEXT) utils.$(OBJEXT)
-@REALLYSTATIC_TRUE@ntfscluster_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@ntfstruncate_DEPENDENCIES =  \
 @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
+ntfscluster_OBJECTS =  ntfscluster.$(OBJEXT) utils.$(OBJEXT)
 @REALLYSTATIC_FALSE@ntfscluster_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
-ntfsfix_OBJECTS =  ntfsfix.$(OBJEXT)
-@REALLYSTATIC_TRUE@ntfsfix_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@ntfscluster_DEPENDENCIES =  \
 @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
+ntfsfix_OBJECTS =  ntfsfix.$(OBJEXT)
 @REALLYSTATIC_FALSE@ntfsfix_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
-ntfsinfo_OBJECTS =  ntfsinfo.$(OBJEXT) utils.$(OBJEXT)
-@REALLYSTATIC_TRUE@ntfsinfo_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@ntfsfix_DEPENDENCIES =  \
 @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
+ntfsinfo_OBJECTS =  ntfsinfo.$(OBJEXT) utils.$(OBJEXT)
 @REALLYSTATIC_FALSE@ntfsinfo_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
+@REALLYSTATIC_TRUE@ntfsinfo_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
 mkntfs_OBJECTS =  attrdef.$(OBJEXT) upcase.$(OBJEXT) boot.$(OBJEXT) \
 sd.$(OBJEXT) mkntfs.$(OBJEXT) utils.$(OBJEXT)
-@REALLYSTATIC_TRUE@mkntfs_DEPENDENCIES =  \
-@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
 @REALLYSTATIC_FALSE@mkntfs_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
-ntfslabel_OBJECTS =  ntfslabel.$(OBJEXT) utils.$(OBJEXT)
-@REALLYSTATIC_TRUE@ntfslabel_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@mkntfs_DEPENDENCIES =  \
 @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
+ntfslabel_OBJECTS =  ntfslabel.$(OBJEXT) utils.$(OBJEXT)
 @REALLYSTATIC_FALSE@ntfslabel_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
-ntfsundelete_OBJECTS =  ntfsundelete.$(OBJEXT) utils.$(OBJEXT)
-@REALLYSTATIC_TRUE@ntfsundelete_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@ntfslabel_DEPENDENCIES =  \
 @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
+ntfsundelete_OBJECTS =  ntfsundelete.$(OBJEXT) utils.$(OBJEXT)
 @REALLYSTATIC_FALSE@ntfsundelete_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
-ntfsresize_OBJECTS =  ntfsresize.$(OBJEXT) utils.$(OBJEXT)
-@REALLYSTATIC_TRUE@ntfsresize_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@ntfsundelete_DEPENDENCIES =  \
 @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
+ntfsresize_OBJECTS =  ntfsresize.$(OBJEXT) utils.$(OBJEXT)
 @REALLYSTATIC_FALSE@ntfsresize_DEPENDENCIES =  \
 @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la
+@REALLYSTATIC_TRUE@ntfsresize_DEPENDENCIES =  \
+@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)