diff --git a/.gitignore b/.gitignore
index 9ff90b0..7830026 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /oci-seccomp-bpf-hook-3baa603a.tar.gz
+/oci-seccomp-bpf-hook-ba7bbb16.tar.gz
diff --git a/oci-seccomp-bpf-hook.spec b/oci-seccomp-bpf-hook.spec
index 2428887..5851bf2 100644
--- a/oci-seccomp-bpf-hook.spec
+++ b/oci-seccomp-bpf-hook.spec
@@ -11,9 +11,10 @@
 %global debug_package   %{nil}
 %endif
 
-# %if ! 0% {?gobuild:1}
-%define gobuild(o:) go build -tags="$BUILDTAGS" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**};
-#% endif
+%if ! 0%{?gobuild:1}
+GO111MODULE=off \
+  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,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
+%endif
 
 %global provider github
 %global provider_tld com
@@ -23,7 +24,7 @@
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 3baa603ae910f2aad29ea694b78b2f7f34b5d5ce
+%global commit0 ba7bbb1682fd295539bdfc76322803951a06198c
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:8})
 
 # bcc is built only for these arches
@@ -31,7 +32,7 @@ ExclusiveArch:  x86_64 %{power64} aarch64 s390x
 
 Name: oci-seccomp-bpf-hook
 Version: 0.0.1
-Release: 0.5.git%{shortcommit0}%{?dist}
+Release: 0.6.git%{shortcommit0}%{?dist}
 Summary: OCI Hook to generate seccomp json files based on EBF syscalls used by container
 License: ASL 2.0
 URL: %{git0}
@@ -60,9 +61,11 @@ Summary:       Remote Oci-Seccomp-Bpf client
 %{repo} provides a library for applications looking to use
 the Container Pod concept popularized by Kubernetes.
 
-
 %prep
 %autosetup -Sgit -n %{repo}-%{commit0}
+sed -i '/$(MAKE) -C docs install/d' Makefile
+sed -i 's/HOOK_BIN_DIR/\%{_usr}\/libexec\/oci\/hooks.d/' %{name}.json
+sed -i '/$(HOOK_DIR)\/%{name}.json/d' Makefile
 
 %build
 mkdir _build
@@ -73,13 +76,23 @@ popd
 ln -s vendor src
 
 export GOPATH=$(pwd)/_build:$(pwd)
-export GO111MODULE=off
-export BUILDTAGS=""
-BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}
-%{__make} docs
+%gobuild -o bin/%{name} %{import_path}
+
+pushd docs
+go-md2man -in %{name}.md -out %{name}.1
+popd
 
 %install
-%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} OCI-SECCOMP-BPF_VERSION=%{version} install
+# install binary
+%{__make} PREFIX=%{buildroot}%{_usr} ETCDIR=%{buildroot}%{_sysconfdir} OCI-SECCOMP-BPF_VERSION=%{version} install
+
+# install %%{name}.json to /usr/share/containers/oci/hooks.d
+install -dp %{buildroot}%{_datadir}/containers/oci/hooks.d
+install -m 0644 %{name}.json %{buildroot}%{_datadir}/containers/oci/hooks.d
+
+# install manpage
+install -dp %{buildroot}%{_mandir}/man1
+install -m 0644 docs/%{name}.1 %{buildroot}/%{_mandir}/man1
 
 %check
 %if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
@@ -110,6 +123,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon Feb 17 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.0.1-0.6.gitba7bbb16
+- Resolves: #1799105 - solve ftbfs and build latest upstream commit
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.1-0.5.git3baa603a
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index e7b445e..c8d79b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (oci-seccomp-bpf-hook-3baa603a.tar.gz) = c2a6cbd5a16e2c60f8a2dabb377918d4e161e39570b42ec73de51eb139950b8be4b278b3952987af8df0b7327b06d5fcc1dc13bda35083b0c037b9ebc0f354af
+SHA512 (oci-seccomp-bpf-hook-ba7bbb16.tar.gz) = 44c80506c328968f0ccf7ab454baeaf39075ed67624a75ae833a7b6086fb29e19891da63493519cbf05314dbe21ca53e7bf0928217e451f09b835d3b8944311b