diff --git a/.gitignore b/.gitignore
index 5a20c88..3a7bf29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/skopeo-b0b750d.tar.gz
+SOURCES/skopeo-404c5bd.tar.gz
diff --git a/.skopeo.metadata b/.skopeo.metadata
index 61af1ea..bb7e8e5 100644
--- a/.skopeo.metadata
+++ b/.skopeo.metadata
@@ -1 +1 @@
-a30fc77726de0c85cba200b79d192155adb44002 SOURCES/skopeo-b0b750d.tar.gz
+9ec15ac466319ce8a14b443b0602f4303ebae135 SOURCES/skopeo-404c5bd.tar.gz
diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec
index 1a30c62..b40a713 100644
--- a/SPECS/skopeo.spec
+++ b/SPECS/skopeo.spec
@@ -12,19 +12,19 @@
 
 %global provider        github
 %global provider_tld    com
-%global project         projectatomic
+%global project         containers 
 %global repo            skopeo
-# https://github.com/projectatomic/skopeo
+# https://github.com/containers/skopeo
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit0         b0b750dfa1bc598a643945c7f292204fa0f0bf09
+%global commit0         404c5bd341ccb383061f4eb505f24d2801b31b94
 %global shortcommit0    %(c=%{commit0}; echo ${c:0:7})
 %global git0            https://%{import_path}
 
 Name: %{repo}
 Epoch: 1
-Version: 0.1.31
-Release: 8.git%{shortcommit0}%{?dist}
+Version: 0.1.35
+Release: 2.git%{shortcommit0}%{?dist}
 Summary: Inspect Docker images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -41,9 +41,8 @@ BuildRequires:  git
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.6.2
 %else
-BuildRequires: go-toolset-7-golang-bin
-BuildRequires: go-toolset-7-runtime
-BuildRequires: openssl-devel
+BuildRequires: go-toolset-1.10
+#BuildRequires: openssl-devel
 %endif
 BuildRequires:  go-md2man
 BuildRequires:  gpgme-devel
@@ -72,14 +71,14 @@ Obsoletes: skopeo-containers < 1:0.1.31-2
 This package installs a default signature store configuration
 policy under `/etc/containers/`.
 
-%{?enable_gotoolset7}
+%{?enable_gotoolset110}
 
 %prep
 %autosetup -Sgit -n %{name}-%{commit0}
 
 %build
-mkdir -p src/github.com/projectatomic
-ln -s ../../../ src/github.com/projectatomic/%{name}
+mkdir -p src/github.com/containers
+ln -s ../../../ src/github.com/containers/%{name}
 
 mkdir -p vendor/src
 for v in vendor/*; do
@@ -158,6 +157,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/bash-completion/completions/%{name}
 
 %changelog
+* Wed Mar 27 2019 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:0.1.35-2.git404c5bd
+- rebase
+
 * Fri Jan 18 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.31-8.gitb0b750d
 - Resolves: #1667289 - install /usr/share/containers/seccomp.json