diff --git a/yast2-ntp-client-3.0.0.tar.bz2 b/yast2-ntp-client-3.0.0.tar.bz2
deleted file mode 100644
index 3bc46cb..0000000
--- a/yast2-ntp-client-3.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8aad33adf46f54848af96cb5e86747351aeec40f970736c8415fb0a26b476369
-size 130894
diff --git a/yast2-ntp-client-3.1.0.tar.bz2 b/yast2-ntp-client-3.1.0.tar.bz2
new file mode 100644
index 0000000..70ab6fa
--- /dev/null
+++ b/yast2-ntp-client-3.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e346969e3e0a9ce217c3aa1f49e26f48f512aa0452acca82f77f3872055a535a
+size 55742
diff --git a/yast2-ntp-client.changes b/yast2-ntp-client.changes
index a7a8d76..0483f54 100644
--- a/yast2-ntp-client.changes
+++ b/yast2-ntp-client.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Sep 19 12:09:02 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
+-------------------------------------------------------------------
+Thu Aug 15 07:36:40 UTC 2013 - lslezak@suse.cz
+
+- move the development documentation to devel-doc subpackage
+- 3.0.1
+
+-------------------------------------------------------------------
+Fri Aug  2 07:04:14 UTC 2013 - lslezak@suse.cz
+
+- convert data file from YCP to YAML format (ntp_servers.ycp ->
+  ntp_servers.yml)
+
 -------------------------------------------------------------------
 Wed Jul 31 08:22:59 UTC 2013 - yast-devel@opensuse.org
 
diff --git a/yast2-ntp-client.spec b/yast2-ntp-client.spec
index a66a937..5b1c865 100644
--- a/yast2-ntp-client.spec
+++ b/yast2-ntp-client.spec
@@ -17,17 +17,17 @@
 
 
 Name:           yast2-ntp-client
-Version:        3.0.0
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-ntp-client-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  perl-XML-Writer
 BuildRequires:  update-desktop-files
 BuildRequires:  yast2
 BuildRequires:  yast2-country-data
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 BuildRequires:  yast2-testsuite
 #SLPAPI.pm 
 # Hostname::CurrentDomain
@@ -46,45 +46,45 @@ Group:          System/YaST
 %description
 This package contains the YaST2 component for NTP client configuration.
 
+%package devel-doc
+Requires:       yast2-ntp-client = %version
+Summary:        YaST2 - NTP Client - Development Documentation
+Group:          System/YaST
+
+%description devel-doc
+This package contains development documentation for using the API
+provided by yast2-ntp-client package.
+
 %prep
-%setup -n yast2-ntp-client-%{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/ntp-client
-/usr/share/YaST2/include/ntp-client/*
-/usr/share/YaST2/clients/ntp-client.rb
-/usr/share/YaST2/clients/ntp-client_*.rb
-/usr/share/YaST2/scrconf/cfg_ntp.scr
-/usr/share/YaST2/scrconf/etc_ntp.scr
-/usr/share/YaST2/modules/*.rb
-%{_prefix}/share/applications/YaST2/ntp-client.desktop
-/usr/share/YaST2/data/ntp_servers.ycp
-%doc %{_prefix}/share/doc/packages/yast2-ntp-client
-/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
+%dir %{yast_yncludedir}/ntp-client
+%{yast_yncludedir}/ntp-client/*
+%{yast_clientdir}/ntp-client.rb
+%{yast_clientdir}/ntp-client_*.rb
+%{yast_scrconfdir}/cfg_ntp.scr
+%{yast_scrconfdir}/etc_ntp.scr
+%{yast_moduledir}/*.rb
+%{yast_desktopdir}/ntp-client.desktop
+%{yast_ydatadir}/ntp_servers.yml
+%{yast_schemadir}/autoyast/rnc/ntpclient.rnc
+
+%dir %{yast_docdir}
+%doc %{yast_docdir}/README
+%doc %{yast_docdir}/COPYING
+%doc %{yast_docdir}/TODO
+%doc %{yast_docdir}/spec.txt
+
+%files devel-doc
+%doc %{yast_docdir}/autodocs
+%doc %{yast_docdir}/ntp.conf_agent.txt
 
 %changelog