diff --git a/p11-kit-extract-trust b/p11-kit-extract-trust
index 2529473..fe9c991 100755
--- a/p11-kit-extract-trust
+++ b/p11-kit-extract-trust
@@ -7,5 +7,10 @@ if test "$UID" != "0"; then
 	exit 2
 fi
 
+if test $# -gt 1; then
+	echo "p11-kit: no additional arguments are supported for this command" >&2
+	exit 2
+fi
+
 exec /usr/bin/update-ca-trust
 
diff --git a/p11-kit.spec b/p11-kit.spec
index c638daa..2edbc53 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -1,5 +1,5 @@
 Name:           p11-kit
-Version:        0.17.5
+Version:        0.18.0
 Release:        1%{?dist}
 Summary:        Library for loading and sharing PKCS#11 modules
 
@@ -108,6 +108,12 @@ fi
 
 
 %changelog
+* Thu Apr 04 2013 Stef Walter <stefw@redhat.com> - 0.18.0-1
+- Update to new upstream stable release
+- Various logging tweaks (#928914, #928750)
+- Make the 'p11-kit extract-trust' explicitly reject
+  additional arguments
+
 * Thu Mar 28 2013 Stef Walter <stefw@redhat.com> - 0.17.5-1
 - Make 'p11-kit extract-trust' call update-ca-trust
 - Work around 32-bit oveflow of certificate dates
diff --git a/sources b/sources
index 84a8d73..90dcad8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a32570fb37070435e66cd62028aa47d  p11-kit-0.17.5.tar.gz
+abb4683c7f193df6e48dbfad443ec9a8  p11-kit-0.18.0.tar.gz