diff --git a/.gitignore b/.gitignore
index 3a7bf29..67507a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/skopeo-404c5bd.tar.gz
+SOURCES/skopeo-e079f9d.tar.gz
diff --git a/.skopeo.metadata b/.skopeo.metadata
index bb7e8e5..8e88cea 100644
--- a/.skopeo.metadata
+++ b/.skopeo.metadata
@@ -1 +1 @@
-9ec15ac466319ce8a14b443b0602f4303ebae135 SOURCES/skopeo-404c5bd.tar.gz
+523696cfb03e7d0554183fe7a55510fd37b60b90 SOURCES/skopeo-e079f9d.tar.gz
diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec
index 6478899..c8e1ae1 100644
--- a/SPECS/skopeo.spec
+++ b/SPECS/skopeo.spec
@@ -10,22 +10,25 @@
 %global debug_package   %{nil}
 %endif
 
+%if ! 0%{?gobuild:1}
+%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
+%endif
+
 %global provider        github
 %global provider_tld    com
 %global project         containers 
 %global repo            skopeo
 # https://github.com/containers/skopeo
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path     %{provider_prefix}
-%global commit0         404c5bd341ccb383061f4eb505f24d2801b31b94
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%global commit0         e079f9d61b2508b57e9510752d7e893b544c3cb8
 %global shortcommit0    %(c=%{commit0}; echo ${c:0:7})
 %global git0            https://%{import_path}
 
 Name: %{repo}
 Epoch: 1
-Version: 0.1.35
-Release: 2.git%{shortcommit0}%{?dist}
-Summary: Inspect Docker images and repositories on registries
+Version: 0.1.37
+Release: 1%{?dist}
+Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
 Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
@@ -35,9 +38,9 @@ Source3: mounts.conf
 Source4: registries.conf
 Source5: registries.conf.5.md
 Source6: seccomp.json       
-ExclusiveArch:  aarch64 %{arm} ppc64le s390x x86_64 %{ix86}
+ExclusiveArch:  aarch64 %{arm} ppc64le s390x x86_64
 BuildRequires:  git
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos}
 # 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
@@ -64,8 +67,8 @@ Summary: Configuration files for working with image signature
 # containers-common
 Conflicts: atomic <= 1:1.13.1-1
 Conflicts: atomic-registries <= 1:1.22.1-2
-Provides: skopeo-containers = %{epoch}:%{version}-%{release}
-Obsoletes: skopeo-containers < 1:0.1.31-2
+Provides: %{name}-containers = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-containers < 1:0.1.31-2
 
 %description -n containers-common
 This package installs a default signature store configuration
@@ -82,18 +85,14 @@ ln -s ../../../ src/github.com/containers/%{name}
 
 mkdir -p vendor/src
 for v in vendor/*; do
-    if test ${v} = vendor/src; then continue; fi
-    if test -d ${v}; then
-	mv ${v} vendor/src/
-    fi
+   if test ${v} = vendor/src; then continue; fi
+   if test -d ${v}; then
+      mv ${v} vendor/src/
+   fi
 done
 
 export GOPATH=$(pwd):$(pwd)/vendor
 
-%if ! 0%{?gobuild:1}
-%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**};
-%endif
-
 %gobuild -o %{name} ./cmd/%{name}
 
 if test -f man/%{name}.1.md; then
@@ -115,7 +114,7 @@ install -m0644 %{SOURCE6} %{buildroot}%{_datadir}/containers/seccomp.json
 install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/containers/
 
 # install secrets patch directory
-install -d -p -m 750 %{buildroot}%{_datadir}/rhel/secrets
+install -d -p -m 755 %{buildroot}%{_datadir}/rhel/secrets
 # rhbz#1110876 - update symlinks for subscription management
 ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
 ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
@@ -149,7 +148,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 
 %files
 %{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/%{name}*.1*
 %license LICENSE
 %doc README.md
 %dir %{_datadir}/bash-completion/
@@ -157,8 +156,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/bash-completion/completions/%{name}
 
 %changelog
-* Wed May 01 2019 Johnny Hughes <johnny@centos.org> - 1:0.1.35-2.git404c5bd
-- Use go-toolset-1.10 on CentOS, build on i386
+* Mon Jun 24 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.37-1
+- bump to v0.1.37
+
+* Fri Jun 07 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.36-2
+- Resolves: #1693961 - /usr/share/rhel/secrets is 755
+
+* Fri Jun 07 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.36-1
+- Resolves: #1717921 - rebase to v0.1.36
 
 * Wed Mar 27 2019 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:0.1.35-2.git404c5bd
 - rebase
@@ -306,7 +311,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 
 * Mon Oct 17 2016 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:0.1.17-0.2
 - obsoletes atomic, fixed dependencies
-- %{_sysconfdir}/containers/ owned only by skopeo-containers
+- %%{_sysconfdir}/containers/ owned only by skopeo-containers
 
 * Fri Oct 14 2016 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:0.1.17-0.1
 - rebase, skopeo-containers subpackage added