diff --git a/Makefile.in b/Makefile.in
index a4c45313..015b894c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,11 +91,11 @@ all_libraries = @all_libraries@
 @DEBUG_TRUE@AM_CFLAGS = @DEBUG_TRUE@-D_FILE_OFFSET_BITS=64 -g -DDEBUG -Wall
 @DEBUG_FALSE@AM_CFLAGS = @DEBUG_FALSE@-D_FILE_OFFSET_BITS=64
 
-SUBDIRS = doc include libntfs ntfstools
+SUBDIRS = doc include libntfs ntfsprogs
 
 EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.libntfs ChangeLog \
 		INSTALL NEWS README autogen.sh linux-ntfs.spec.in \
-		TODO.ntfstools
+		TODO.ntfsprogs
 
 
 AUTOMAKE_OPTIONS = gnu
@@ -395,7 +395,7 @@ libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
 strip:
-	$(MAKE) -C ntfstools strip
+	$(MAKE) -C ntfsprogs strip
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/configure b/configure
index 179f0e86..8a271fde 100755
--- a/configure
+++ b/configure
@@ -6324,13 +6324,13 @@ trap 'rm -fr `echo "
 	doc/Makefile
 	include/Makefile
 	libntfs/Makefile
-	ntfstools/Makefile
-	ntfstools/mkntfs.8
-	ntfstools/ntfsfix.8
-	ntfstools/ntfslabel.8
-	ntfstools/ntfsinfo.8
-	ntfstools/ntfsundelete.8
-	ntfstools/ntfsresize.8
+	ntfsprogs/Makefile
+	ntfsprogs/mkntfs.8
+	ntfsprogs/ntfsfix.8
+	ntfsprogs/ntfslabel.8
+	ntfsprogs/ntfsinfo.8
+	ntfsprogs/ntfsundelete.8
+	ntfsprogs/ntfsresize.8
 	linux-ntfs.spec
  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -6457,13 +6457,13 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
 	doc/Makefile
 	include/Makefile
 	libntfs/Makefile
-	ntfstools/Makefile
-	ntfstools/mkntfs.8
-	ntfstools/ntfsfix.8
-	ntfstools/ntfslabel.8
-	ntfstools/ntfsinfo.8
-	ntfstools/ntfsundelete.8
-	ntfstools/ntfsresize.8
+	ntfsprogs/Makefile
+	ntfsprogs/mkntfs.8
+	ntfsprogs/ntfsfix.8
+	ntfsprogs/ntfslabel.8
+	ntfsprogs/ntfsinfo.8
+	ntfsprogs/ntfsundelete.8
+	ntfsprogs/ntfsresize.8
 	linux-ntfs.spec
 "}
 EOF