diff --git a/yast2-ntp-client-2.17.12.tar.bz2 b/yast2-ntp-client-2.17.12.tar.bz2
deleted file mode 100644
index b114b6e..0000000
--- a/yast2-ntp-client-2.17.12.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a89657767eb666c5af2fd915385c5d025c8b306b600e3055fed5cebf7e67357
-size 123865
diff --git a/yast2-ntp-client-2.18.0.tar.bz2 b/yast2-ntp-client-2.18.0.tar.bz2
new file mode 100644
index 0000000..49c3f7e
--- /dev/null
+++ b/yast2-ntp-client-2.18.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:733d83f42c8a6494fd0102e1e52671cfed507c3f8cf8752dce1859804032635a
+size 125656
diff --git a/yast2-ntp-client.changes b/yast2-ntp-client.changes
index df3f589..c66a4ef 100644
--- a/yast2-ntp-client.changes
+++ b/yast2-ntp-client.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue Mar 31 16:52:04 CEST 2009 - mvidner@suse.cz
+
+- Moved more code dealing with NTP setup from yast2-country
+  to yast2-ntp-client to make the API less fragile (bnc#483787).
+- 2.18.0
+
+-------------------------------------------------------------------
+Tue Mar 17 14:01:57 CET 2009 - mvidner@suse.cz
+
+- Do not pop up with questions in CLI mode (bnc#456553).
+
+-------------------------------------------------------------------
+Fri Feb 20 12:39:15 CET 2009 - mvidner@suse.cz
+
+- Fixed: the checkbox for opening/closing the firewall port would
+  have no effect (bnc#476951). Same problem, different reason.
+- 2.17.14
+
+-------------------------------------------------------------------
+Fri Jan 23 14:32:10 CET 2009 - mvidner@suse.cz
+
+- Fixed: the checkbox for opening/closing the firewall port would
+  have no effect (bnc#468405).
+- 2.17.13
+
 -------------------------------------------------------------------
 Mon Jan 19 14:45:26 CET 2009 - mvidner@suse.cz
 
diff --git a/yast2-ntp-client.spec b/yast2-ntp-client.spec
index 6aec935..e8309df 100644
--- a/yast2-ntp-client.spec
+++ b/yast2-ntp-client.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-ntp-client (Version 2.17.12)
+# spec file for package yast2-ntp-client (Version 2.18.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,12 +19,12 @@
 
 
 Name:           yast2-ntp-client
-Version:        2.17.12
+Version:        2.18.0
 Release:        1
 License:        GPL v2 or later
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-ntp-client-2.17.12.tar.bz2
+Source0:        yast2-ntp-client-2.18.0.tar.bz2
 Prefix:         /usr
 BuildRequires:  perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
 BuildRequires:  yast2-country-data
@@ -46,7 +46,7 @@ Authors:
     Lukas Ocilka <locilka@suse.cz>
 
 %prep
-%setup -n yast2-ntp-client-2.17.12
+%setup -n yast2-ntp-client-2.18.0
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,20 @@ rm -rf "$RPM_BUILD_ROOT"
 %doc %{prefix}/share/doc/packages/yast2-ntp-client
 /usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
 %changelog
+* Tue Mar 31 2009 mvidner@suse.cz
+- Moved more code dealing with NTP setup from yast2-country
+  to yast2-ntp-client to make the API less fragile (bnc#483787).
+- 2.18.0
+* Tue Mar 17 2009 mvidner@suse.cz
+- Do not pop up with questions in CLI mode (bnc#456553).
+* Fri Feb 20 2009 mvidner@suse.cz
+- Fixed: the checkbox for opening/closing the firewall port would
+  have no effect (bnc#476951). Same problem, different reason.
+- 2.17.14
+* Fri Jan 23 2009 mvidner@suse.cz
+- Fixed: the checkbox for opening/closing the firewall port would
+  have no effect (bnc#468405).
+- 2.17.13
 * Mon Jan 19 2009 mvidner@suse.cz
 - Use the iburst option also for the server added during the
   installation, to make the initial sync work even if the