diff --git a/ChangeLog b/ChangeLog
index b23c5506..6c632cc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@ xx/xx/2005 - 1.12.0-WIP
 	  ntfs_mft_record_alloc.  (Yura)
 	- Make ntfsmount use new APIs for file and directory creation/deletion.
 	  Implement utime operation.  (Yura)
+	- Hard link mkfs.ntfs and mkfs.ntfs.8 with mkntfs and mkntfs.8  (Szaka).
 
 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.
 
diff --git a/TODO.ntfsprogs b/TODO.ntfsprogs
index 7f95de06..a802fb36 100644
--- a/TODO.ntfsprogs
+++ b/TODO.ntfsprogs
@@ -8,7 +8,6 @@ Thanks,
 * mkntfs *
 **********
 
-- mkntfs should be hard linked with mkfs.ntfs for the mkfs utility.
 - Got a report that creating a floppy with mkntfs failed.  Difference between
   this floppy and the floppy created by the special tool found on the net was
   said to be that the bitmap is 256kib on the special floppy while mkntfs will
diff --git a/configure.ac b/configure.ac
index 274fca0e..1d924ee7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,7 @@ esac
 AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_INSTALL
+AC_PATH_PROG(LN, ln, ln)
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
diff --git a/ntfsprogs.spec.in b/ntfsprogs.spec.in
index 74f8497c..3c95487c 100644
--- a/ntfsprogs.spec.in
+++ b/ntfsprogs.spec.in
@@ -90,6 +90,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %{bindir}/ntfs[^m][^o]*
 %{sbindir}/*
 %{mandir}/man8/mkntfs.8*
+%{mandir}/man8/mkfs.ntfs.8*
 %{mandir}/man8/ntfs[^m][^o]*.8*
 %{_libdir}/libntfs.*so*
 
@@ -111,6 +112,9 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.*a*
 
 %changelog
+* Mon Aug 15 2005 Szabolcs Szakacsits <szaka@sienet.hu>
+- Add mkfs.ntfs.
+
 * Mon Jul 18 2005 Anton Altaparmakov <aia21@cantab.net>
 - Add ntfsmount fuse module in separate rpm ntfsprogs-fuse.
 
diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
index f73d15a0..1b3b6f74 100644
--- a/ntfsprogs/Makefile.am
+++ b/ntfsprogs/Makefile.am
@@ -134,3 +134,16 @@ libs:
 extra:	extras
 
 extras:	libs $(EXTRA_PROGRAMS)
+
+# mkfs.ntfs[.8] hard links
+
+install-exec-hook:
+	$(LN) -f $(DESTDIR)$(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs
+
+install-data-hook:
+	$(LN) -f $(DESTDIR)$(man8dir)/mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+
+uninstall-local:
+	rm -f $(DESTDIR)$(sbindir)/mkfs.ntfs
+	rm -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+