diff --git a/yast2-transfer-3.0.1.tar.bz2 b/yast2-transfer-3.0.1.tar.bz2
deleted file mode 100644
index f71709c..0000000
--- a/yast2-transfer-3.0.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7cced2df369e496fc09f052129647984dba24b262235d50f1314e90ba57d705b
-size 297245
diff --git a/yast2-transfer-3.1.0.tar.bz2 b/yast2-transfer-3.1.0.tar.bz2
new file mode 100644
index 0000000..fd85bf1
--- /dev/null
+++ b/yast2-transfer-3.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23988dc6258a4b2890c17672e4c9e1896a413709a5d86ed3859384d96073c777
+size 13815
diff --git a/yast2-transfer.changes b/yast2-transfer.changes
index 6272734..bd2e067 100644
--- a/yast2-transfer.changes
+++ b/yast2-transfer.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 19 17:40:31 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Thu Aug  1 05:56:06 UTC 2013 - lslezak@suse.cz
 
diff --git a/yast2-transfer.spec b/yast2-transfer.spec
index a6f0fad..6eea8a4 100644
--- a/yast2-transfer.spec
+++ b/yast2-transfer.spec
@@ -17,11 +17,11 @@
 
 
 Name:           yast2-transfer
-Version:        3.0.1
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-transfer-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  curl-devel
 BuildRequires:  doxygen
@@ -31,7 +31,7 @@ BuildRequires:  perl-XML-Writer
 BuildRequires:  update-desktop-files
 BuildRequires:  yast2
 BuildRequires:  yast2-core-devel
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 %if 0%{?suse_version} < 1220
 BuildRequires:  libxcrypt-devel
 %endif
@@ -63,51 +63,33 @@ This package contains development documentation for using the API
 provided by yast2-transfer package.
 
 %prep
-%setup -n yast2-transfer-%{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
+%yast_install
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2ag_curl.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2ag_tftp.la
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -f $RPM_BUILD_ROOT/%{yast_plugindir}/libpy2ag_curl.la
+rm -f $RPM_BUILD_ROOT/%{yast_plugindir}/libpy2ag_tftp.la
 
 %files
 %defattr(-,root,root)
-/usr/share/YaST2/scrconf/*.scr
-%{_libdir}/YaST2/plugin/libpy2ag_curl.so.*
-%{_libdir}/YaST2/plugin/libpy2ag_curl.so
-%{_libdir}/YaST2/plugin/libpy2ag_tftp.so.*
-%{_libdir}/YaST2/plugin/libpy2ag_tftp.so
-/usr/share/YaST2/modules/*
+%{yast_scrconfdir}/*.scr
+%{yast_plugindir}/libpy2ag_curl.so.*
+%{yast_plugindir}/libpy2ag_curl.so
+%{yast_plugindir}/libpy2ag_tftp.so.*
+%{yast_plugindir}/libpy2ag_tftp.so
+%{yast_moduledir}/*
 
-%dir %{_prefix}/share/doc/packages/yast2-transfer
-%doc %{_prefix}/share/doc/packages/yast2-transfer/README
-%doc %{_prefix}/share/doc/packages/yast2-transfer/COPYING
+%dir %{yast_docdir}
+%doc %{yast_docdir}/README
+%doc %{yast_docdir}/COPYING
 
 %files devel-doc
-%doc %{_prefix}/share/doc/packages/yast2-transfer/*.html
-%doc %{_prefix}/share/doc/packages/yast2-transfer/agent-curl
-%doc %{_prefix}/share/doc/packages/yast2-transfer/agent-tftp
+%doc %{yast_docdir}/*.html
+%doc %{yast_docdir}/agent-curl
+%doc %{yast_docdir}/agent-tftp
 
 %changelog