diff --git a/p11-kit-0.17.5.tar.gz b/p11-kit-0.17.5.tar.gz
deleted file mode 100644
index c20a5ce..0000000
--- a/p11-kit-0.17.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67d3570eec01dad5b38b6e816b24dfdf1c9fa49e72f6d9203b472cb858ea700c
-size 952285
diff --git a/p11-kit-0.18.0.tar.gz b/p11-kit-0.18.0.tar.gz
new file mode 100644
index 0000000..ade0942
--- /dev/null
+++ b/p11-kit-0.18.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ebcdcf57b7686b92146cf475cb2b66cdf3757f6e62d8e77c39dae89ffb43e31
+size 961382
diff --git a/p11-kit.changes b/p11-kit.changes
index cc8bd38..d04c6ae 100644
--- a/p11-kit.changes
+++ b/p11-kit.changes
@@ -1,29 +1,40 @@
+-------------------------------------------------------------------
+Thu Apr  4 13:34:40 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 0.18.0:
+  + Fix use of trust module with gcr and empathy (fdo#62896).
+  + Further tweaks to trust module date parsing.
+  + Fix unaligned memory reads (fdo#62819).
+  + Win32 fixes (fdo#63062, fdo#63046).
+  + Debug and logging tweaks (fdo#62874).
+  + Other build fixes.
+
 -------------------------------------------------------------------
 Thu Mar 28 21:42:55 UTC 2013 - zaitor@opensuse.org
 
 - Update to version 0.17.5:
   + Don't try to guess at overflowing time values on 32-bit
-    systems (bgo#62825).
-  + Test fixes (bgo#927394).
+    systems (fdo#62825).
+  + Test fixes (fdo#927394).
 
 -------------------------------------------------------------------
 Thu Mar 21 08:10:37 UTC 2013 - dimstar@opensuse.org
 
 - Update to version 0.17.4:
   + Check for duplicate certificates in a token, warn and discard
-    (bgo#62548).
+    (fdo#62548).
   + Implement a proper index so we have decent load performance.
 
 -------------------------------------------------------------------
 Wed Mar 20 19:09:13 UTC 2013 - dimstar@opensuse.org
 
 - Update to version 0.17.3:
-  + Use descriptive labels for the trust module tokens (bgo#62534).
+  + Use descriptive labels for the trust module tokens (fdo#62534).
   + Remove the temporary built in distrust objects.
   + Make extracted output directories and files read-only
-    (bgo#61898).
+    (fdo#61898).
   + Don't export unneccessary ABI.
-  + Build fixes (bgo#62479).
+  + Build fixes (fdo#62479).
 
 -------------------------------------------------------------------
 Tue Mar 19 20:39:24 UTC 2013 - dimstar@opensuse.org
@@ -33,19 +44,19 @@ Tue Mar 19 20:39:24 UTC 2013 - dimstar@opensuse.org
   + Fix several crashers.
 - Changes from version 0.17.1:
   + Support a p11-kit specific PKCS#11 attribute persistance format
-    (bgo#62156).
+    (fdo#62156).
   + Use the SHA1 hash of SPKI as the CKA_ID in the trust module by
-    default (bgo#62329).
+    default (fdo#62329).
   + Refactor a trust builder which builds objects out of parsed
-    data (bgo#62329).
-  + Combine trust policy when extracting certificates (bgo#61497).
+    data (fdo#62329).
+  + Combine trust policy when extracting certificates (fdo#61497).
   + The extract --comment option adds comments to PEM bundles
-    (bgo#62029).
+    (fdo#62029).
   + A new 'priority' config option for ordering modules
-    (bgo#61978).
+    (fdo#61978).
   + Make each configured path its own trust module token
-    (bgo#61499).
-  + Use --with-trust-paths to configure trust module (bgo#62327).
+    (fdo#61499).
+  + Use --with-trust-paths to configure trust module (fdo#62327).
   + Fix bug decoding some PEM files.
   + Better debug output for trust module lookups.
   + Work around bug in NSS when doing serial number lookups.
diff --git a/p11-kit.spec b/p11-kit.spec
index 7f8b9f7..2bed205 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -17,7 +17,7 @@
 
 
 Name:           p11-kit
-Version:        0.17.5
+Version:        0.18.0
 Release:        0
 Summary:        Library to work with PKCS#11 modules
 License:        BSD-3-Clause