diff --git a/.gitignore b/.gitignore
index 4f08832..1f37186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+/results_*
+/*.src.rpm
+
 /xdr-08e072f.tar.gz
 /calmh-xdr-f9b9f8f.tar.gz
 /xdr-v1.1.0.tar.gz
+/xdr-1.1.0.tar.gz
diff --git a/golang-github-calmh-xdr.spec b/golang-github-calmh-xdr.spec
index 5917183..809762a 100644
--- a/golang-github-calmh-xdr.spec
+++ b/golang-github-calmh-xdr.spec
@@ -6,13 +6,14 @@ Release:        2%{?dist}
 License:        MIT
 
 # https://github.com/calmh/xdr
-%global goipath github.com/calmh/xdr
+%global repo    xdr
+%global goipath github.com/calmh/%{repo}
 %global tag     v1.1.0
 
 %gometa
 
 URL:            %{gourl}
-Source0:        %{gosource}
+Source0:        %{gourl}/archive/%{tag}/%{repo}-%{version}.tar.gz
 
 %description
 %{summary}
@@ -31,7 +32,7 @@ building other packages which use import path with
 
 
 %prep
-%forgesetup
+%forgeautosetup -p1
 
 
 %build
@@ -64,10 +65,9 @@ install -p -m 0755 _bin/cmd/genxdr %{buildroot}%{_bindir}
 
 
 %changelog
-* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org>
-- 1.1.0-2
-- 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/
+* Wed Oct 24 2018 Fabio Valentini <decathorpe@gmail.com> - 1:1.1.0-2
+- Use standard GitHub SourceURL again for consistency between releases.
+- Use forgeautosetup instead of gosetup.
 
 * Wed Aug 15 2018 Fabio Valentini <decathorpe@gmail.com> - 1:1.1.0-1
 - Update to 'new' version 1.1.0.
diff --git a/sources b/sources
index 7534083..7ce5c34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xdr-v1.1.0.tar.gz) = 3d439746cd1e6d0f503d58d901efddde31af12264c724dd7d1226d110a5641f799f70e3fdf97a64c274c78545756550b53b0fdb0cf2ed3a839e43ae44152f8e4
+SHA512 (xdr-1.1.0.tar.gz) = 3d439746cd1e6d0f503d58d901efddde31af12264c724dd7d1226d110a5641f799f70e3fdf97a64c274c78545756550b53b0fdb0cf2ed3a839e43ae44152f8e4