diff --git a/yast2-bootloader-3.0.3.tar.bz2 b/yast2-bootloader-3.0.3.tar.bz2
deleted file mode 100644
index 124f45b..0000000
--- a/yast2-bootloader-3.0.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50e9429305193b0fe29f746775130b1b03e2d5464031c41f2ff66ec8465dd55a
-size 276858
diff --git a/yast2-bootloader-3.1.0.tar.bz2 b/yast2-bootloader-3.1.0.tar.bz2
new file mode 100644
index 0000000..0c9b349
--- /dev/null
+++ b/yast2-bootloader-3.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dff97232149d1f52f23d5ccaa41af00db084f4067396d5598b78e6d81dd254f
+size 345062
diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes
index 4b5ab66..e465061 100644
--- a/yast2-bootloader.changes
+++ b/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 18 12:27:52 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Fri Aug 23 13:37:42 CEST 2013 - snwint@suse.de
 
diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec
index 03e589d..965b8f1 100644
--- a/yast2-bootloader.spec
+++ b/yast2-bootloader.spec
@@ -17,14 +17,14 @@
 
 
 Name:           yast2-bootloader
-Version:        3.0.3
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-bootloader-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  update-desktop-files
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 PreReq:         /bin/sed %fillup_prereq
 # Installation::*version variables
 # Wizard::SetDialogTitleAndIcon
@@ -85,31 +85,13 @@ This package contains development documentation for using the API
 provided by yast2-bootloader package.
 
 %prep
-%setup -n yast2-bootloader-%{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
 
 %post
 %{fillup_only -n bootloader}
@@ -119,36 +101,36 @@ rm -rf "$RPM_BUILD_ROOT"
 
 # menu items
 
-%dir %{_prefix}/share/applications/YaST2
-%{_prefix}/share/applications/YaST2/bootloader.desktop
+%dir %{yast_desktopdir}
+%{yast_desktopdir}/bootloader.desktop
 
-%dir /usr/share/YaST2/include
-%dir /usr/share/YaST2/include/bootloader
-/usr/share/YaST2/include/bootloader/*
-%dir /usr/share/YaST2/modules
-/usr/share/YaST2/modules/*
-%dir /usr/share/YaST2/clients
-/usr/share/YaST2/clients/bootloader*.rb
-/usr/share/YaST2/clients/print-product.rb
-/usr/share/YaST2/clients/inst_*.rb
-%dir %{_prefix}/lib/YaST2/bin
-%{_prefix}/lib/YaST2/bin/*
-%dir /usr/lib/YaST2/servers_non_y2
-/usr/lib/YaST2/servers_non_y2/ag_*
-%dir /usr/share/YaST2/scrconf
-/usr/share/YaST2/scrconf/*.scr
-%dir /var/adm/fillup-templates
-/var/adm/fillup-templates/*
-%dir /usr/share/YaST2/schema
-%dir /usr/share/YaST2/schema/autoyast
-%dir /usr/share/YaST2/schema/autoyast/rnc
-/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
+%dir %{yast_yncludedir}
+%dir %{yast_yncludedir}/bootloader
+%{yast_yncludedir}/bootloader/*
+%dir %{yast_moduledir}
+%{yast_moduledir}/*
+%dir %{yast_clientdir}
+%{yast_clientdir}/bootloader*.rb
+%{yast_clientdir}/print-product.rb
+%{yast_clientdir}/inst_*.rb
+%dir %{yast_ybindir}
+%{yast_ybindir}/*
+%dir %{yast_agentdir}
+%{yast_agentdir}/ag_*
+%dir %{yast_scrconfdir}
+%{yast_scrconfdir}/*.scr
+%dir %{yast_fillupdir}
+%{yast_fillupdir}/*
+%dir %{yast_schemadir}
+%dir %{yast_schemadir}/autoyast
+%dir %{yast_schemadir}/autoyast/rnc
+%{yast_schemadir}/autoyast/rnc/bootloader.rnc
 
-%dir %{_prefix}/share/doc/packages/yast2-bootloader
-%doc %{_prefix}/share/doc/packages/yast2-bootloader/README
-%doc %{_prefix}/share/doc/packages/yast2-bootloader/COPYING
+%dir %{yast_docdir}
+%doc %{yast_docdir}/README
+%doc %{yast_docdir}/COPYING
 
 %files devel-doc
-%doc %{_prefix}/share/doc/packages/yast2-bootloader/autodocs
+%doc %{yast_docdir}/autodocs
 
 %changelog