diff --git a/.gitignore b/.gitignore
index 6e59bf8..5363e37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /go-zfs-1b4ae6fb4e77b095934d4430860ff202060169f8.tar.gz
+/go-zfs-d5b163290a48f624cbf244ebe4e89ce38653064c.tar.gz
diff --git a/golang-github-mistifyio-go-zfs.spec b/golang-github-mistifyio-go-zfs.spec
index fed3a07..2078526 100644
--- a/golang-github-mistifyio-go-zfs.spec
+++ b/golang-github-mistifyio-go-zfs.spec
@@ -1,69 +1,78 @@
-# http://github.com/mistifyio/go-zfs
+# Generated by go2rpm
+# zfs-fuse daemon must be running and the test has to be run under root
+%bcond_with check
 
+# https://github.com/mistifyio/go-zfs
 %global goipath         github.com/mistifyio/go-zfs
-%global commit          1b4ae6fb4e77b095934d4430860ff202060169f8
+Version:                2.1.1
+%global commit          d5b163290a48f624cbf244ebe4e89ce38653064c
 
+%gometa
 
-%gometa -i
+%global common_description %{expand:
+Simple wrappers for ZFS command line tools.}
 
 Name:           golang-github-mistifyio-go-zfs
-Version:        0
-Release:        0.11%{?dist}
-Summary:        Go wrappers for ZFS commands
-# Detected licences
-# - *No copyright* UNKNOWN at 'LICENSE'
+Release:        1%{?dist}
+Summary:        Go wrappers for zfs commands
+
+# Upstream license specification: Apache-2.0
 License:        ASL 2.0
 URL:            %{gourl}
-Source0:        %{gosource}
+Source:         %{gosource}
 Source1:        glide.yaml
-Source2:        glide.yaml
+Source2:        glide.lock
 
-ExcludeArch:    aarch64 s390x
+BuildRequires:  golang(github.com/pborman/uuid)
 
 %description
-%{summary}
+%{common_description}
 
 %package devel
 Summary:       %{summary}
 BuildArch:     noarch
 
-BuildRequires: golang(github.com/pborman/uuid)
-BuildRequires: zfs-fuse
-
-Requires: zfs-fuse
-
 %description devel
-%{summary}
+%{common_description}
 
 This package contains library source intended for
 building other packages which use import path with
 %{goipath} prefix.
 
 %prep
-%forgesetup
+%forgeautosetup -p1
 cp %{SOURCE1} %{SOURCE2} .
+
 %install
-# source codes for building projects
 %goinstall glide.lock glide.yaml
 
-%check
-# zfs-fuse deamon must be running and the test has to be run under root
-#%%gochecks
+# Remove in F33
+# Remove erroneous glide.lock folder
+%pretrans devel -p <lua>
+path = "%{gopath}/src/%{goipath}/glide.lock"
+st = posix.stat(path)
+if st and st.type == "directory" then
+  os.remove(path)
+end
 
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
+%if %{with check}
+%check
+%gochecks
+%endif
 
 %files devel -f devel.file-list
 %license LICENSE
 %doc CONTRIBUTING.md README.md
 
 %changelog
-* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org>
-- 0-0.11
+* Wed Apr 03 22:33:15 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2.1.1-1.20190403gitd5b1632
+- Release 2.1.1, commit d5b163290a48f624cbf244ebe4e89ce38653064c (#1695231)
+
+* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org> - 0-0.11.git1b4ae6f
 - redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias
 - https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - Forge-specific packaging variables
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.10.git1b4ae6f
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Mon Jun 18 2018 Jan Chaloupka <jchaloup@redhat.com> - 0-0.9.git1b4ae6f
diff --git a/sources b/sources
index 6f12ceb..14a0b96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go-zfs-1b4ae6fb4e77b095934d4430860ff202060169f8.tar.gz) = 80f0233e15a4776fcd41f223d5179bc8218688036c1a7122dbc21b94040e25c0d66def81f757594b658d703da559a8bfa9772834f45841eaf0b7b8c663767219
+SHA512 (go-zfs-d5b163290a48f624cbf244ebe4e89ce38653064c.tar.gz) = 09252bcf7217a277fb8a9843d3678f8b4edd4ce8fa192a7d042bbf5eaa85ffef1ac303207d5cb7cb323756ee2ffe9924705a8d64a956a88046488c6832848e67