diff --git a/WHATS_NEW b/WHATS_NEW
index 10fca74c5..a4cb983e4 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.89 - 
 ==================================
+  Don't ignore configure --mandir and --infodir.
   Drop pool memory allocated within lv_has_target_type().
   Reduce stack allocation of some PATH_MAX sized char buffers.
   Unlock memory before writing metadata.
@@ -8,7 +9,7 @@ Version 2.02.89 -
   Skip non-virtual snapshots for availability change for lvchange with vg name.
   Adjusted mirror region size only for mirrors and raids.
   Reorder prompt conditions for removal of active volumes.
-  Avoid 'mda inconsistency' by properly registering UNLABELLED_PV flag (2.02.86).
+  Avoid 'mda inconsistency' by properly registering UNLABELLED_PV flag (2.02.86)
   Fix --enable-static_link unless using --enable-dmeventd / --enable-udev_sync.
   Move gentoo MAKEDEV to /sbin in lvm2create_initrd.
   Add filter to avoid scan of device if it is part of active multipath.
diff --git a/make.tmpl.in b/make.tmpl.in
index e2030506b..ed00a1b14 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -58,9 +58,9 @@ libdir = $(DESTDIR)@libdir@
 usrlibdir = $(DESTDIR)@usrlibdir@
 sbindir = $(DESTDIR)@sbindir@
 usrsbindir = $(DESTDIR)@usrsbindir@
-datarootdir = $(DESTDIR)@datarootdir@
-infodir = $(datarootdir)/info
-mandir = $(datarootdir)/man
+datarootdir = @datarootdir@
+infodir = $(DESTDIR)@infodir@
+mandir = $(DESTDIR)@mandir@
 localedir = $(DESTDIR)@LOCALEDIR@
 staticdir = $(DESTDIR)@STATICDIR@
 udevdir = $(DESTDIR)@udevdir@