diff --git a/Makefile.am b/Makefile.am
index eff9856a..d2c158fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,3 +54,9 @@ distclean-local:
 
 clean-local:
 	-rm -rf docs/doxygen_api_docs libargon2.la
+
+install-data-local:
+	$(MKDIR_P) -m 0755 $(DESTDIR)/${EXTERNAL_LUKS2_TOKENS_PATH}
+
+uninstall-local:
+	rmdir $(DESTDIR)/${EXTERNAL_LUKS2_TOKENS_PATH} 2>/dev/null || :
diff --git a/configure.ac b/configure.ac
index ad379cb1..9ad145b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,7 @@ AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
 AC_ENABLE_STATIC(no)
 LT_INIT
 PKG_PROG_PKG_CONFIG
diff --git a/misc/fedora/cryptsetup.spec b/misc/fedora/cryptsetup.spec
index 38a1730b..fe9a0dcd 100644
--- a/misc/fedora/cryptsetup.spec
+++ b/misc/fedora/cryptsetup.spec
@@ -77,7 +77,6 @@ can be used for offline reencryption of disk in situ.
 
 %install
 %make_install
-mkdir -p -m 0755 $RPM_BUILD_ROOT%{_libdir}/%{name}/
 rm -rf %{buildroot}%{_libdir}/*.la
 rm -rf %{buildroot}%{_libdir}/%{name}/*.la