diff --git a/pam_mount-2.17.tar.asc b/pam_mount-2.17.tar.asc
deleted file mode 100644
index 76afffc..0000000
--- a/pam_mount-2.17.tar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEI2hsEKRWkb56QlEJ1jiBgfNaCTgFAl+3nY0ACgkQ1jiBgfNa
-CThEJg/+P40vq1X3dHCTViuC5SHzfpXWl2Mq0G+9Y2N9/mWhj2q6doAzfutwAmI7
-M2ErOXwCuB0lRhHBJBKS9NbW+4HPZ4+TEaxjCB846AhLvyXyn9u+DtWImGRlG2x4
-FZ+2NMzpoqnW/s8lfClWUjY5Cfn/84OA5pBCcHQwmUiPdvuQRy4XxFhaVT50edAl
-4CSs9OFiRd4Fu2f3ZCfMrDspgiAg9OGGXUGWaiQ/4u4gZU8WboQeAJNjFUZKxM4G
-NeunDut77qHolWZzHNt5edShHPI+2k95ZZZvOCFnZrIrB1Fj+CDQjgn6Z+CHDR+p
-TQ8GrAOFw+YUui8UHvbnHMvKoINGEs0WU04QmoruKyPlrqIgB5WCCqLbNaXhQ9PA
-/Pj79p3KlRoGExq+UrjWPXWwGYa14Q/CSuFv4P+LpQflmy3PUVUBZmlMzKlWuMXP
-wo1y1+rn2RRGHP7yNDsfi99EPN4qh4pBOOV1ajDnRVpF2qVlPu4Qr+YTwxlWRKF2
-R7ZYdkC+i1qkUHmxdUorxaYrEVx41VbPDgHmK/4aFgTNPGtwcTUs32LW6f8DSwpQ
-NMiYqfj0vy5pNx6tUfKJjm6Wv66NLjd6VsxIuwBEmSgkb1dsZXM1rXFhekHkY5O9
-Qc3wa3xUrSowVP9KSDcplmyk+uq+cx8tidJkqNu5tkhAEO2Wfto=
-=ZViF
------END PGP SIGNATURE-----
diff --git a/pam_mount-2.17.tar.xz b/pam_mount-2.17.tar.xz
deleted file mode 100644
index 800ec9d..0000000
--- a/pam_mount-2.17.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be45ea3ba646293bfb7b0c916ecbe2d21e2224174d99886c83cf1aa8843256e0
-size 326948
diff --git a/pam_mount-2.18.tar.asc b/pam_mount-2.18.tar.asc
new file mode 100644
index 0000000..4d2282f
--- /dev/null
+++ b/pam_mount-2.18.tar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEI2hsEKRWkb56QlEJ1jiBgfNaCTgFAl/zAz0ACgkQ1jiBgfNa
+CTjnBA/9Fn/T5rGqYJSFju0AZ4zFf9IZNMox8Xlsfr2vG1zAI5Th6tcImY/ON0iK
+og/iUYBuubYHv5owSfiUleb1tUo4E39YgeQg8xeRg4FNo71HS63it6WAfL2Bv6fy
+JXEUxbC4xP5kPz8XVEVyKObbfoNIc+fkA2LD2ptYNQqTuk9CBUaCT3SMcSQu06O5
++myw1V5iHMdUUPqsp4iVTCjjgfKjrUsZT+Bh5VEEj8KARYuQnZ3fBaN3TXhGKoZ9
+kH5RQBG7OaOTzEnBKF3L4WifydVmkyRNnTe4AF3nHBOnwiy1fEX2CI46kOMAAbxL
+eqZU+fHfttwZGPqurOnk5CLVXlV7w8dJu2z3uQwR+7qKGaN974WbggJXQ82ntlN/
+xodfu3gaJVRC16Xmkh2HJ/C16WjKVeG5lfk9W5Q5Kr0XZkjOfdrzrdp8uPFr7VFG
+Ymhe+C6QkFcnb6eb9UR1YUIV83nKbAzBPMClViPEtUH9z01RDALYljgoxZe/sfKI
+Or/FJccYa24kV1xBzR5wI7ML+EXg7+3+P3ukYCcLfLk2GZtVlIxl/W3AVK4mPhVF
+HzpYTIra7ArnXoZcrLsKEfh5fDNiHoCO/vu7IHI0pjrt/wGACSZu0EAQWGCc5Mcn
+qgFg3cAnevUZyDXzhVoxjLIELt1cxs1qQV5mzUstZFTysaZokeA=
+=8YOs
+-----END PGP SIGNATURE-----
diff --git a/pam_mount-2.18.tar.xz b/pam_mount-2.18.tar.xz
new file mode 100644
index 0000000..e0fcbe5
--- /dev/null
+++ b/pam_mount-2.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0af77a6e9867bb483c1d3e056a0289a7954efd84a6bf65f9d3f1268705b46220
+size 324524
diff --git a/pam_mount.changes b/pam_mount.changes
index 856c2e3..a627e95 100644
--- a/pam_mount.changes
+++ b/pam_mount.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan  4 12:12:40 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2.18
+  * Cure mount.crypt recursively executing itself with -t crypt
+  * Allow luserconf to be placed outside home directory
+
 -------------------------------------------------------------------
 Tue Dec  1 14:21:57 UTC 2020 - Marcin Bajor <marcin.bajor@gmail.com>
 
diff --git a/pam_mount.spec b/pam_mount.spec
index 2a4ec0a..3fa303f 100644
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pam_mount
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           pam_mount
 %define lname	libcryptmount0
-Version:        2.17
+Version:        2.18
 Release:        0
 Summary:        A PAM Module that can Mount Volumes for a User Session
 License:        LGPL-2.1-or-later AND GPL-2.0-or-later
@@ -46,7 +46,7 @@ BuildRequires:  xz
 BuildRequires:  pkgconfig(libHX) >= 3.12.1
 BuildRequires:  pkgconfig(libcrypto) >= 0.9.7
 BuildRequires:  pkgconfig(libcryptsetup) >= 1.1.2
-BuildRequires:  pkgconfig(libpcre) >= 7
+BuildRequires:  pkgconfig(libpcre2-8)
 BuildRequires:  pkgconfig(libxml-2.0) >= 2.6
 BuildRequires:  pkgconfig(mount) >= 2.20
 
@@ -111,7 +111,7 @@ b="%buildroot"
 rm -f "$b/%_lib/security"/*.{a,la} "$b/%_libdir"/*.la
 #install the docs
 mkdir -p "$b/%_docdir/%name/examples"
-cp -a doc/bugs.txt doc/news.txt LICENSE* doc/faq.txt doc/todo.txt doc/options.txt doc/pam_mount.txt "$b/%_docdir/%name/"
+cp -a doc/bugs.txt doc/news.txt LICENSE* doc/faq.txt doc/todo.txt doc/options.txt "$b/%_docdir/%name/"
 install -m 755 %SOURCE1 "$b/%_docdir/%name/examples/"
 install -m 755 %SOURCE2 "$b/%_docdir/%name/examples/"
 mkdir -p "$b/sbin"