diff --git a/kbd.changes b/kbd.changes
index d99deaf..119a5f2 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 13 14:53:41 CEST 2017 - sbrabec@suse.com
+
+- Add vlock.pamd PAM file (bsc#1056449#c8).
+- Clean spec file.
+
 -------------------------------------------------------------------
 Fri Sep 22 15:51:51 CEST 2017 - sbrabec@suse.com
 
diff --git a/kbd.spec b/kbd.spec
index 70db46e..0c3c4fa 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -29,6 +29,7 @@ Source:         %{name}-%{version}-repack.tar.xz
 Source1:        kbd_fonts.tar.bz2
 Source2:        suse-add.tar.bz2
 Source3:        README.SUSE
+Source4:        vlock.pamd
 Source5:        kbd.fillup
 Source8:        sysconfig.console
 Source9:        sysconfig.keyboard
@@ -73,7 +74,6 @@ Requires(postun): coreutils
 Requires(pre):  %fillup_prereq
 Provides:       vlock = 2.2.3
 Obsoletes:      vlock <= 2.2.3
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Load and save keyboard mappings. This is needed if you are not using
@@ -96,6 +96,7 @@ Please note that %{name}-legacy is not helpful without kbd.
 
 %prep
 %setup -q -a 1 -a 2 -n kbd-%{version}
+
 cp -fp %{SOURCE44} .
 cp -fp %{SOURCE45} .
 %patch0 -p1
@@ -239,16 +240,18 @@ install -m 644 %{SOURCE8} $FILLUP_DIR/sysconfig.console
 install -m 644 %{SOURCE9} $FILLUP_DIR/sysconfig.keyboard
 cat %{SOURCE5} >> $FILLUP_DIR/sysconfig.keyboard
 %ifnarch %{ix86} x86_64
-   rm -f %{buildroot}/%{_mandir}/man8/resizecons.8*
+   rm -f %{buildroot}%{_mandir}/man8/resizecons.8*
 %endif
 %ifarch %{sparc} m68k
-rm -f %{buildroot}/%{_mandir}/man8/getkeycodes.8*
-rm -f %{buildroot}/%{_mandir}/man8/setkeycodes.8*
+rm -f %{buildroot}%{_mandir}/man8/getkeycodes.8*
+rm -f %{buildroot}%{_mandir}/man8/setkeycodes.8*
 %endif
-install -m 755 fbtest    %{buildroot}/%{_sbindir}
-install -m 644 %{SOURCE12} %{buildroot}/%{_mandir}/man8/
-install -m 755 %{SOURCE13} %{buildroot}/%{_bindir}/guess_encoding
-install -m 755 %{SOURCE14} %{buildroot}/%{_bindir}/kbd
+install -m 755 fbtest    %{buildroot}%{_sbindir}
+install -d %{buildroot}%{_sysconfdir}/pam.d
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/vlock
+install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
+install -m 755 %{SOURCE13} %{buildroot}%{_bindir}/guess_encoding
+install -m 755 %{SOURCE14} %{buildroot}%{_bindir}/kbd
 #UsrMerge
 mkdir -p %{buildroot}/bin
 mkdir -p %{buildroot}/sbin
@@ -296,41 +299,41 @@ ln -s %{_bindir}/resizecons %{buildroot}/bin
 #EndUsrMerge
 
 # Move original keymaps to legacy directory
-mkdir -p %{buildroot}/%{kbd}/keymaps/legacy
-mv %{buildroot}/%{kbd}/keymaps/{amiga,atari,i386,include,mac,ppc,sun} %{buildroot}/%{kbd}/keymaps/legacy
+mkdir -p %{buildroot}%{kbd}/keymaps/legacy
+mv %{buildroot}%{kbd}/keymaps/{amiga,atari,i386,include,mac,ppc,sun} %{buildroot}%{kbd}/keymaps/legacy
 
 # Convert X keyboard layouts to console keymaps
-mkdir -p %{buildroot}/%{kbd}/keymaps/xkb
+mkdir -p %{buildroot}%{kbd}/keymaps/xkb
 perl xml2lst.pl < %{_datadir}/X11/xkb/rules/base.xml > layouts-variants.lst
 while read line; do
   XKBLAYOUT=`echo "$line" | cut -d " " -f 1`
   echo "$XKBLAYOUT" >> layouts-list.lst
   XKBVARIANT=`echo "$line" | cut -d " " -f 2`
-  ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip -n9 > %{buildroot}/%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
+  ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip -n9 > %{buildroot}%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
 done < layouts-variants.lst
 
 # Convert X keyboard layouts (plain, no variant)
 cat layouts-list.lst | sort -u >> layouts-list-uniq.lst
 while read line; do
-  ckbcomp "$line" | gzip -n9 > %{buildroot}/%{kbd}/keymaps/xkb/"$line".map.gz
+  ckbcomp "$line" | gzip -n9 > %{buildroot}%{kbd}/keymaps/xkb/"$line".map.gz
 done < layouts-list-uniq.lst
 
 # wipe converted layouts which cannot input ASCII (rh#1031848)
-zgrep -L "U+0041" %{buildroot}/%{kbd}/keymaps/xkb/* | xargs rm -f
+zgrep -L "U+0041" %{buildroot}%{kbd}/keymaps/xkb/* | xargs rm -f
 
 # Rename the converted default fi (kotoistus) layout (rh#1117891)
-gunzip %{buildroot}/%{kbd}/keymaps/xkb/fi.map.gz
-mv %{buildroot}/%{kbd}/keymaps/xkb/fi.map %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map
-gzip -n9 %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map
+gunzip %{buildroot}%{kbd}/keymaps/xkb/fi.map.gz
+mv %{buildroot}%{kbd}/keymaps/xkb/fi.map %{buildroot}%{kbd}/keymaps/xkb/fi-kotoistus.map
+gzip -n9 %{buildroot}%{kbd}/keymaps/xkb/fi-kotoistus.map
 
 # Fix converted cz layout - add compose rules (rh#1181581)
-gunzip %{buildroot}/%{kbd}/keymaps/xkb/cz.map.gz
-patch %{buildroot}/%{kbd}/keymaps/xkb/cz.map < %{SOURCE15}
-gzip -n9 %{buildroot}/%{kbd}/keymaps/xkb/cz.map
+gunzip %{buildroot}%{kbd}/keymaps/xkb/cz.map.gz
+patch %{buildroot}%{kbd}/keymaps/xkb/cz.map < %{SOURCE15}
+gzip -n9 %{buildroot}%{kbd}/keymaps/xkb/cz.map
 
 # Generate entries for systemd's /usr/share/systemd/kbd-model-map
 mkdir -p  %{buildroot}%{_datadir}/systemd
-sh ./genmap4systemd.sh %{buildroot}/%{kbd}/keymaps/xkb \
+sh ./genmap4systemd.sh %{buildroot}%{kbd}/keymaps/xkb \
   > %{buildroot}%{_datadir}/systemd/kbd-model-map.xkb-generated
 
 %find_lang %{name}
@@ -347,7 +350,6 @@ sh ./genmap4systemd.sh %{buildroot}/%{kbd}/keymaps/xkb \
 %{?regenerate_initrd_posttrans}
 
 %files -f %{name}.lang
-%defattr(-,root,root)
 #config(noreplace) /etc/sysconfig/console
 %doc %{_defaultdocdir}/kbd
 #doc COPYING CHANGES README CREDITS
@@ -463,11 +465,11 @@ sh ./genmap4systemd.sh %{buildroot}/%{kbd}/keymaps/xkb \
 %{_mandir}/man8/setvesablank.8%{ext_man}
 %{_mandir}/man8/setvtrgb.8%{ext_man}
 %{_mandir}/man8/vcstime.8%{ext_man}
+%config(noreplace) %{_sysconfdir}/pam.d/vlock
 %dir %{_datadir}/systemd
 %{_datadir}/systemd/kbd-model-map.xkb-generated
 
 %files legacy
-%defattr(-,root,root)
 %{kbd}/keymaps/legacy
 
 %changelog
diff --git a/vlock.pamd b/vlock.pamd
new file mode 100644
index 0000000..fef9dd4
--- /dev/null
+++ b/vlock.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth     include        common-auth
+account  include        common-account
+password include        common-password
+session  include        common-session