diff --git a/.gitignore b/.gitignore
index 2e924cd..c2e59bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/crypto-e4e2799.tar.gz
+/crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz
diff --git a/blake2s-fix-vet-format-string-issue.patch b/blake2s-fix-vet-format-string-issue.patch
new file mode 100644
index 0000000..e509726
--- /dev/null
+++ b/blake2s-fix-vet-format-string-issue.patch
@@ -0,0 +1,32 @@
+From 3680b74baed71629f388a7469a82ff4b295c2135 Mon Sep 17 00:00:00 2001
+From: Tobias Klauser <tklauser@distanz.ch>
+Date: Sun, 5 Nov 2017 16:25:19 +0100
+Subject: [PATCH] blake2s: fix vet format string issue
+
+Fix the following format string issue reported by go vet:
+
+  blake2s_test.go:188: Fatalf format %v reads arg #3, but call has only 2 args
+
+Change-Id: I689eadb7d7310ae93acd8a8419755f2724ff41dd
+Reviewed-on: https://go-review.googlesource.com/75978
+Reviewed-by: Filippo Valsorda <hi@filippo.io>
+---
+ blake2s/blake2s_test.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/blake2s/blake2s_test.go b/blake2s/blake2s_test.go
+index 938fef3..cfeb18b 100644
+--- a/blake2s/blake2s_test.go
++++ b/blake2s/blake2s_test.go
+@@ -185,7 +185,7 @@ func testHashes2X(t *testing.T) {
+ 	if n, err := h.Read(result[:]); err != nil {
+ 		t.Fatalf("#unknown length: error from Read: %v", err)
+ 	} else if n != len(result) {
+-		t.Fatalf("#unknown length: Read returned %d bytes, want %d: %v", n, len(result))
++		t.Fatalf("#unknown length: Read returned %d bytes, want %d", n, len(result))
+ 	}
+ 
+ 	const expected = "2a9a6977d915a2c4dd07dbcafe1918bf1682e56d9c8e567ecd19bfd7cd93528833c764d12b34a5e2a219c9fd463dab45e972c5574d73f45de5b2e23af72530d8"
+-- 
+2.7.5
+
diff --git a/golang-googlecode-go-crypto.spec b/golang-googlecode-go-crypto.spec
index aa6a357..5afa350 100644
--- a/golang-googlecode-go-crypto.spec
+++ b/golang-googlecode-go-crypto.spec
@@ -1,19 +1,19 @@
 # https://github.com/golang/crypto
-%global provider_prefix github.com/golang/crypto
-%global gobaseipath     golang.org/x/crypto
-%global commit          e4e2799dd7aab89f583e1d898300d96367750991
-%global commitdate      20170329
+%global forgeurl        https://github.com/golang/crypto
+%global goipath         golang.org/x/crypto
+%global commit          9419663f5a44be8b34ca85f08abc5fe1be11f8a3
 %global x_name          golang-golangorg-crypto
 
-%gocraftmeta -i
+%gometa -i
 
-Name:           %{goname}
+Name:           golang-googlecode-go-crypto
 Version:        0
-Release:        0.19.%{commitdate}git%{shortcommit}%{?dist}
+Release:        0.20%{?dist}
 Summary:        Supplementary Go cryptography libraries
 License:        BSD
 URL:            %{gourl}
 Source0:        %{gosource}
+Patch0:         blake2s-fix-vet-format-string-issue.patch
 
 %description
 %{summary}
@@ -21,8 +21,6 @@ Source0:        %{gosource}
 %package -n %{x_name}-devel
 Summary:       %{summary}
 
-BuildRequires: golang(golang.org/x/net/context)
-BuildRequires: golang(golang.org/x/net/context/ctxhttp)
 BuildRequires: golang(golang.org/x/sys/unix)
 
 %description -n %{x_name}-devel
@@ -30,25 +28,30 @@ BuildRequires: golang(golang.org/x/sys/unix)
 
 This package contains library source intended for
 building other packages which use import path with
-%{gobaseipath} prefix.
+%{goipath} prefix.
 
 %prep
 %gosetup
+%patch0 -p1
 
 %install
-%goinstall $(find . -iname testdata -d)
+files="$(find . -iname testdata -type d)"
+%goinstall $files
 
 %check
-%gochecks %{gobaseipath}/{chacha20poly1305,ocsp,ssh}
+%gochecks -d chacha20poly1305 -d ocsp -d ssh
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
 %files -n %{x_name}-devel -f devel.file-list
 %license LICENSE
-%doc CONTRIBUTING.md README AUTHORS CONTRIBUTORS
+%doc *.md AUTHORS CONTRIBUTORS
 
 %changelog
+* Tue Mar 06 2018 Jan Chaloupka <jchaloup@redhat.com> - 0-0.20.git9419663
+- Bump to upstream 9419663f5a44be8b34ca85f08abc5fe1be11f8a3
+
 * Mon Feb 26 2018 Jan Chaloupka <jchaloup@redhat.com> - 0-0.19.20170329gite4e2799
 - Autogenerate some parts using the new macros
 
diff --git a/sources b/sources
index 507664d..8f61c92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (crypto-e4e2799.tar.gz) = 7986db9fdc652c1f3ea4d9607c517eef21d734b31f27bea63e7ff35fa75b406086e58eaf201594c472a9eadbc10458ccac97fbc1dcbd65b88698a5b4c03d90f3
+SHA512 (crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz) = 7335eca4fafdede3f5737900c46ba92ba598ec2e36534b5f507dc7684e5a68a1dc3dde6137172c6fab7445ee811612a5c1da3f8db180188fa4bc91935c9a489e