diff --git a/pam-chroot/install b/pam-chroot/install
index bba8e48ca..8c6c5a561 100644
--- a/pam-chroot/install
+++ b/pam-chroot/install
@@ -1,6 +1,6 @@
 #!/bin/sh -eux
 
-ub_install
-
 mkdir -p "$UB_INSTALLDIR"/etc/security
+mkdir -p "$UB_INSTALLDIR"/usr/lib/security
 cp chroot.conf "$UB_INSTALLDIR"/etc/security/
+cp pam_chroot.so "$UB_INSTALLDIR"/usr/lib/security/
diff --git a/pam-chroot/patches/compilefix.patch b/pam-chroot/patches/compilefix.patch
index 78c99a10d..f9d251ff4 100644
--- a/pam-chroot/patches/compilefix.patch
+++ b/pam-chroot/patches/compilefix.patch
@@ -1,7 +1,7 @@
-diff -Naur orig/Makefile patched/Makefile
+diff -Nur orig/Makefile mod/Makefile
 --- orig/Makefile	2007-09-30 20:05:47.000000000 +0200
-+++ patched/Makefile	2016-08-21 14:43:05.572869500 +0200
-@@ -4,11 +4,12 @@
++++ mod/Makefile	2019-10-14 21:02:29.766080762 +0200
+@@ -4,7 +4,7 @@
  
  # if you are not using gmake, you may need to convert the ":=" variables into
  # "=" variables.  you cannot have recursive definitions if you do that.
@@ -10,14 +10,3 @@ diff -Naur orig/Makefile patched/Makefile
  CPPFLAGS := -I.
  LDFLAGS  := -x --shared $(LDFLAGS)
  
- OUT=pam_chroot.so
-+DESTDIR=
- 
- all:	$(OUT)
- 
-@@ -19,4 +20,4 @@
- 	rm -f *.o $(OUT)
- 
- install:
--	install -s -o0 -g0 -m755 $(OUT) /lib/security
-+	install -s -o0 -g0 -m755 $(OUT) $(DESTDIR)/lib/security
diff --git a/pam-krb5/compile b/pam-krb5/compile
index 70e728f54..3c23fa6d9 100644
--- a/pam-krb5/compile
+++ b/pam-krb5/compile
@@ -1,4 +1,5 @@
 #!/bin/sh -eux
 
+export SECURITYDIR=/usr/lib/security
 ub_compile \
-	--libdir=/lib
+	--libdir=/usr/lib
diff --git a/pam-krb5/install b/pam-krb5/install
index a0defea7f..da331535c 100644
--- a/pam-krb5/install
+++ b/pam-krb5/install
@@ -1,4 +1,4 @@
 #!/bin/sh -eux
 
 ub_install
-rm "$UB_INSTALLDIR"/lib/security/pam_krb5.la
+rm "$UB_INSTALLDIR"/usr/lib/security/pam_krb5.la
diff --git a/pam-smb/compile b/pam-smb/compile
index 57993b9e2..cc12e2263 100644
--- a/pam-smb/compile
+++ b/pam-smb/compile
@@ -1,3 +1,4 @@
 #!/bin/sh -eux
 
-ub_compile
+ub_compile \
+    --disable-encrypt-pass
diff --git a/pam-smb/install b/pam-smb/install
index 51be3e076..8fda84ea2 100644
--- a/pam-smb/install
+++ b/pam-smb/install
@@ -1,4 +1,4 @@
 #!/bin/sh -eux
 
-mkdir -p "$UB_INSTALLDIR"/lib/security
-cp -a pam_smb_auth.so "$UB_INSTALLDIR"/lib/security/
+mkdir -p "$UB_INSTALLDIR"/usr/lib/security
+cp -a pam_smb_auth.so "$UB_INSTALLDIR"/usr/lib/security/
diff --git a/pam-smb/patches/README.patch b/pam-smb/patches/README.patch
new file mode 100644
index 000000000..c07b03a49
--- /dev/null
+++ b/pam-smb/patches/README.patch
@@ -0,0 +1,24 @@
+diff -Nur orig/README mod/README
+--- orig/README	2003-08-15 04:52:27.000000000 +0200
++++ mod/README	2019-10-14 20:41:49.565543008 +0200
+@@ -68,13 +68,13 @@
+ Note the pam_smb_auth.so line.
+ 
+ #%PAM-1.0
+-auth       required	/lib/security/pam_securetty.so
+-auth	   required	/lib/security/pam_smb_auth.so
+-auth       required	/lib/security/pam_nologin.so
+-account    required	/lib/security/pam_pwdb.so
+-password   required	/lib/security/pam_cracklib.so
+-password   required	/lib/security/pam_pwdb.so shadow nullok use_authtok
+-session    required	/lib/security/pam_pwdb.so
++auth       required	/usr/lib/security/pam_securetty.so
++auth	   required	/usr/lib/security/pam_smb_auth.so
++auth       required	/usr/lib/security/pam_nologin.so
++account    required	/usr/lib/security/pam_pwdb.so
++password   required	/usr/lib/security/pam_cracklib.so
++password   required	/usr/lib/security/pam_pwdb.so shadow nullok use_authtok
++session    required	/usr/lib/security/pam_pwdb.so
+ 
+ For Solaris:
+ 	You need to change the /etc/pam.conf other line to
diff --git a/pam-ssh/install b/pam-ssh/install
index 35f705b08..1fa8889f3 100644
--- a/pam-ssh/install
+++ b/pam-ssh/install
@@ -1,4 +1,4 @@
 #!/bin/sh -eux
 
-mkdir -p ${UB_INSTALLDIR}/lib/security/
-cp .libs/pam_ssh.so ${UB_INSTALLDIR}/lib/security/
+mkdir -p ${UB_INSTALLDIR}/usr/lib/security/
+cp .libs/pam_ssh.so ${UB_INSTALLDIR}/usr/lib/security/
diff --git a/pam-usb/install b/pam-usb/install
index ad24e46f2..ddf467e36 100644
--- a/pam-usb/install
+++ b/pam-usb/install
@@ -1,4 +1,4 @@
 #!/bin/sh -eux
 
-mkdir -p "$UB_INSTALLDIR"/lib/security
+mkdir -p "$UB_INSTALLDIR"/usr/lib/security
 ub_install
diff --git a/pam-usb/patches/fix-destdir.patch b/pam-usb/patches/fix-destdir.patch
index 8956dbb0b..47b21a54f 100644
--- a/pam-usb/patches/fix-destdir.patch
+++ b/pam-usb/patches/fix-destdir.patch
@@ -5,7 +5,7 @@
  PAM_USB			:= pam_usb.so
  PAM_USB_LDFLAGS	:= -shared
 -PAM_USB_DEST	:= $(DESTDIR)/lib/security
-+PAM_USB_DEST	:= /lib/security
++PAM_USB_DEST	:= /usr/lib/security
  
  # pamusb-check
  PAMUSB_CHECK_SRCS	:= src/pamusb-check.c