--- pve-access-control/Makefile.alt	2017-06-22 10:13:00.000000000 +0300
+++ pve-access-control/Makefile	2017-07-13 14:54:40.146397623 +0300
@@ -9,7 +9,7 @@ SBINDIR=${PREFIX}/sbin
 MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc/${PACKAGE}
 MAN1DIR=${MANDIR}/man1/
-BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
+BASHCOMPLDIR=/etc/bash_completion.d/
 
 export PERLDIR=${PREFIX}/share/perl5
 
@@ -31,7 +31,7 @@ dinstall: deb
 	dpkg -i ${DEB}
 
 pveum.bash-completion: PVE/CLI/pveum.pm
-	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->generate_bash_completions();" >$@.tmp
+	perl -I../data -I../../data -I../data/PVE -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->generate_bash_completions();" >$@.tmp
 	mv $@.tmp $@
 
 .PHONY: install
@@ -50,7 +50,7 @@ install: pveum.1 oathkeygen pveum.bash-c
 .PHONY: test
 test:
 	perl -I. ./pveum verifyapi
-	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->verify_api();"
+	perl -I../data -I../../data -I../data/PVE -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->verify_api();"
 
 .PHONY: deb
 deb: ${DEB}
--- pve-access-control/PVE/Auth/PAM.pm.alt	2017-06-22 10:13:00.000000000 +0300
+++ pve-access-control/PVE/Auth/PAM.pm	2017-07-13 14:52:15.951259428 +0300
@@ -27,7 +27,7 @@ sub authenticate_user {
     # user (www-data) need to be able to read /etc/passwd /etc/shadow
     die "no password\n" if !$password;
 
-    my $pamh = new Authen::PAM('common-auth', $username, sub {
+    my $pamh = new Authen::PAM('passwd', $username, sub {
 	my @res;
 	while(@_) {
 	    my $msg_type = shift;
--- pve-access-control/PVE/Auth/Plugin.pm.alt	2017-06-22 10:13:00.000000000 +0300
+++ pve-access-control/PVE/Auth/Plugin.pm	2017-07-13 14:52:15.951259428 +0300
@@ -181,7 +181,7 @@ sub parse_config {
     # add default domains
 
     $cfg->{ids}->{pve}->{type} = 'pve'; # force type
-    $cfg->{ids}->{pve}->{comment} = "Proxmox VE authentication server"
+    $cfg->{ids}->{pve}->{comment} = "PVE authentication server"
 	if !$cfg->{ids}->{pve}->{comment};
 
     $cfg->{ids}->{pam}->{type} = 'pam'; # force type