diff --git a/yast2-pam-3.0.0.tar.bz2 b/yast2-pam-3.0.0.tar.bz2
deleted file mode 100644
index 654862e..0000000
--- a/yast2-pam-3.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b1e76b592253c506b01b475423f69ac0f3597a3813e10bd51a7b09472731493
-size 93314
diff --git a/yast2-pam-3.1.0.tar.bz2 b/yast2-pam-3.1.0.tar.bz2
new file mode 100644
index 0000000..dfa5a4e
--- /dev/null
+++ b/yast2-pam-3.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e903060cd60d0fca470cff1555314111307fc6eca733c16951a2dfa44387f9c
+size 14233
diff --git a/yast2-pam.changes b/yast2-pam.changes
index 647b24c..661b08e 100644
--- a/yast2-pam.changes
+++ b/yast2-pam.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 19 12:42:45 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Wed Jul 31 08:36:33 UTC 2013 - yast-devel@opensuse.org
 
diff --git a/yast2-pam.spec b/yast2-pam.spec
index 182e687..1fde895 100644
--- a/yast2-pam.spec
+++ b/yast2-pam.spec
@@ -17,17 +17,17 @@
 
 
 Name:           yast2-pam
-Version:        3.0.0
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-pam-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  doxygen
 BuildRequires:  perl-XML-Writer
 BuildRequires:  yast2
 BuildRequires:  yast2-core-devel
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 BuildRequires:  yast2-testsuite
 Requires:       yast2
 
@@ -50,37 +50,19 @@ Group:          System/YaST
 This agent is used by YaST2 to modify the PAM configuration files
 
 %prep
-%setup -n yast2-pam-%{version}
+%setup -n %{name}-%{version}
 
 %build
-%{_prefix}/bin/y2tool y2autoconf
-%{_prefix}/bin/y2tool y2automake
-autoreconf --force --install
-
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-
-./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
-# V=1: verbose build in case we used AM_SILENT_RULES(yes)
-# so that RPM_OPT_FLAGS check works
-make %{?jobs:-j%jobs} V=1
+%yast_build
 
 %install
-make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
-    d=${f##*/}
-    %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
-done
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+%yast_install
 
 %files
 %defattr(-,root,root)
-/usr/share/YaST2/modules/*
-/usr/share/YaST2/scrconf/*.scr
-/usr/lib/YaST2/servers_non_y2/ag_passwd
-%doc %{_prefix}/share/doc/packages/yast2-pam
+%{yast_moduledir}/*
+%{yast_scrconfdir}/*.scr
+%{yast_agentdir}/ag_passwd
+%doc %{yast_docdir}
 
 %changelog