diff --git a/ChangeLog b/ChangeLog
index 2b9969bf..8af7b9f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+xx/xx/2004 - 1.8.4 - WIP
+	- .
+
 19/01/2004 - 1.8.3 - Lots of small fixes.
 	- Update ntfsinfo (Matthew J. Fanto, me)
 	- Add new API attrib.[hc]:ntfs_compressed_attr_pread(). NOTE: You want
diff --git a/configure b/configure
index ce06421a..c08b00f4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for ntfsprogs 1.8.3.
+# Generated by GNU Autoconf 2.57 for ntfsprogs 1.8.4-WIP.
 #
 # Report bugs to <linux-ntfs-dev@lists.sourceforge.net>.
 #
@@ -422,8 +422,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='ntfsprogs'
 PACKAGE_TARNAME='ntfsprogs'
-PACKAGE_VERSION='1.8.3'
-PACKAGE_STRING='ntfsprogs 1.8.3'
+PACKAGE_VERSION='1.8.4-WIP'
+PACKAGE_STRING='ntfsprogs 1.8.4-WIP'
 PACKAGE_BUGREPORT='linux-ntfs-dev@lists.sourceforge.net'
 
 ac_unique_file="config.h.in"
@@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ntfsprogs 1.8.3 to adapt to many kinds of systems.
+\`configure' configures ntfsprogs 1.8.4-WIP to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1021,7 +1021,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ntfsprogs 1.8.3:";;
+     short | recursive ) echo "Configuration of ntfsprogs 1.8.4-WIP:";;
    esac
   cat <<\_ACEOF
 
@@ -1132,7 +1132,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-ntfsprogs configure 1.8.3
+ntfsprogs configure 1.8.4-WIP
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1147,7 +1147,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ntfsprogs $as_me 1.8.3, which was
+It was created by ntfsprogs $as_me 1.8.4-WIP, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -1841,7 +1841,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ntfsprogs'
- VERSION='1.8.3'
+ VERSION='1.8.4-WIP'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21673,7 +21673,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by ntfsprogs $as_me 1.8.3, which was
+This file was extended by ntfsprogs $as_me 1.8.4-WIP, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21736,7 +21736,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-ntfsprogs config.status 1.8.3
+ntfsprogs config.status 1.8.4-WIP
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 862969f5..06d40815 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 #
 
 AC_PREREQ(2.57)
-AC_INIT(ntfsprogs, 1.8.3, linux-ntfs-dev@lists.sourceforge.net)
+AC_INIT(ntfsprogs, 1.8.4-WIP, linux-ntfs-dev@lists.sourceforge.net)
 AC_CANONICAL_TARGET([])
 AC_CONFIG_SRCDIR([config.h.in])
 AM_CONFIG_HEADER([config.h])
diff --git a/ntfsprogs/Makefile.in b/ntfsprogs/Makefile.in
index 4f6abc61..e75c5253 100644
--- a/ntfsprogs/Makefile.in
+++ b/ntfsprogs/Makefile.in
@@ -147,10 +147,10 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-@REALLYSTATIC_TRUE@AM_LIBS = $(top_srcdir)/libntfs/.libs/libntfs.a
 @REALLYSTATIC_FALSE@AM_LIBS = $(top_srcdir)/libntfs/libntfs.la
-@REALLYSTATIC_TRUE@AM_LFLAGS = -static
+@REALLYSTATIC_TRUE@AM_LIBS = $(top_srcdir)/libntfs/.libs/libntfs.a
 @REALLYSTATIC_FALSE@AM_LFLAGS = $(all_libraries)
+@REALLYSTATIC_TRUE@AM_LFLAGS = -static
 @REALLYSTATIC_TRUE@STATIC_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 @REALLYSTATIC_FALSE@LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@