diff --git a/yast2-firewall-3.0.1.tar.bz2 b/yast2-firewall-3.0.1.tar.bz2
deleted file mode 100644
index 6300341..0000000
--- a/yast2-firewall-3.0.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b54c0d363735d4c20325678fd0bf6969193e43032c3fc07a402465e1203e70f2
-size 117842
diff --git a/yast2-firewall-3.1.0.tar.bz2 b/yast2-firewall-3.1.0.tar.bz2
new file mode 100644
index 0000000..458664c
--- /dev/null
+++ b/yast2-firewall-3.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f9375ef47520868917a7c01d9a8765b4a48ba6b3e7cd7d725a2570110bc79e8
+size 42789
diff --git a/yast2-firewall.changes b/yast2-firewall.changes
index c72e9c2..59b2067 100644
--- a/yast2-firewall.changes
+++ b/yast2-firewall.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 18 16:07:51 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Wed Aug 21 07:21:20 UTC 2013 - mfilka@suse.com
 
diff --git a/yast2-firewall.spec b/yast2-firewall.spec
index afb25ba..ee9fc4f 100644
--- a/yast2-firewall.spec
+++ b/yast2-firewall.spec
@@ -17,15 +17,15 @@
 
 
 Name:           yast2-firewall
-Version:        3.0.1
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-firewall-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  perl-XML-Writer
 BuildRequires:  update-desktop-files
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 BuildRequires:  yast2-testsuite
 # IP::CheckNetwork
 BuildRequires:  yast2 >= 2.23.25
@@ -53,40 +53,22 @@ Group:          System/YaST
 A YaST2 module to be used for configuring a firewall.
 
 %prep
-%setup -n yast2-firewall-%{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)
-%dir /usr/share/YaST2/include/firewall
-/usr/share/YaST2/include/firewall/*
-/usr/share/YaST2/modules/SuSEFirewall*
-/usr/share/YaST2/clients/firewall*
-%{_prefix}/share/applications/YaST2/firewall.desktop
-/usr/share/YaST2/schema/autoyast/rnc/firewall.rnc
-%doc %{_prefix}/share/doc/packages/yast2-firewall
+%dir %{yast_yncludedir}/firewall
+%{yast_yncludedir}/firewall/*
+%{yast_moduledir}/SuSEFirewall*
+%{yast_clientdir}/firewall*
+%{yast_desktopdir}/firewall.desktop
+%{yast_schemadir}/autoyast/rnc/firewall.rnc
+%doc %{yast_docdir}
 
 %changelog