diff --git a/.gitignore b/.gitignore
index 22dc266..daead67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/runc-84a082b.tar.gz
+SOURCES/runc-aea4f21.tar.gz
diff --git a/.runc.metadata b/.runc.metadata
index 70bb928..2300756 100644
--- a/.runc.metadata
+++ b/.runc.metadata
@@ -1 +1 @@
-2b0b00dfbb91d8b98c78c1946c134b3541e1e440 SOURCES/runc-84a082b.tar.gz
+7de652a014b59b797b937e8540e53971add71cbc SOURCES/runc-aea4f21.tar.gz
diff --git a/SPECS/runc.spec b/SPECS/runc.spec
index c001c45..b884acf 100644
--- a/SPECS/runc.spec
+++ b/SPECS/runc.spec
@@ -7,7 +7,7 @@
 %else
 %global with_devel 0
 %global with_bundled 1
-%global with_debug 0
+%global with_debug 1
 %global with_check 0
 %global with_unit_test 0
 %endif
@@ -18,6 +18,10 @@
 %global debug_package   %{nil}
 %endif
 
+%if ! 0%{?gobuild:1}
+%define gobuild(o:) go build -buildmode=pie -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -tags "$BUILDTAGS" -a -v -x %{?**};
+%endif
+
 %global provider        github
 %global provider_tld    com
 %global project         opencontainers
@@ -26,15 +30,12 @@
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
 %global git0 https://github.com/opencontainers/runc
-%global commit0 84a082bfef6f932de921437815355186db37aeb1
+%global commit0 aea4f21eec795d9f5b7c7d514f568c08d58b8e58
 %global shortcommit0    %(c=%{commit0}; echo ${c:0:7})
 
 Name: %{repo}
-%if 0%{?fedora}
-Epoch: 1
-%endif
 Version: 1.0.0
-Release: 14.rc4dev.git%{shortcommit0}%{?dist}
+Release: 21.rc4.dev.git%{shortcommit0}%{?dist}
 Summary: CLI for running Open Containers
 License: ASL 2.0
 URL: http//%{provider_prefix}
@@ -42,6 +43,7 @@ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz
 Source1: 99-containers.conf
 Patch0: change-default-root.patch
 Requires: criu
+Requires(pre): container-selinux >= 2:2.2-2
 
 # 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
@@ -168,9 +170,10 @@ popd
 
 pushd GOPATH/src/%{import_path}
 export GOPATH=%{gopath}:$(pwd)/GOPATH
+export BUILDTAGS='selinux seccomp'
 
-sed -i 's/seccomp/selinux seccomp/' Makefile
-make all
+GOPATH=$GOPATH %gobuild -o %{name} %{import_path} 
+GOPATH=$GOPATH %gobuild -o recvtty %{import_path}/contrib/cmd/recvtty
 
 pushd man
 ./md2man-all.sh
@@ -179,6 +182,7 @@ popd
 %install
 install -d -p %{buildroot}%{_bindir}
 install -p -m 755 %{name} %{buildroot}%{_bindir}
+install -p -m 755 recvtty %{buildroot}%{_bindir}
 
 install -d -p %{buildroot}%{_mandir}/man8
 install -p -m 644 man/man8/* %{buildroot}%{_mandir}/man8
@@ -262,6 +266,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %license LICENSE
 %doc MAINTAINERS_GUIDE.md PRINCIPLES.md README.md CONTRIBUTING.md
 %{_bindir}/%{name}
+%{_bindir}/recvtty
 %{_mandir}/man8/%{name}*
 %{_usr}/lib/sysctl.d/99-containers.conf
 
@@ -280,7 +285,28 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %endif
 
 %changelog
-* Fri Sep 22 2017 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:1.0.0-14.rc4dev.git84a082b
+* Thu Nov 09 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-21.rc4.dev.gitaea4f21
+- enable debuginfo and include -buildmode=pie for go build
+
+* Tue Nov 07 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-20.rc4.dev.gitaea4f21
+- use Makefile
+
+* Tue Nov 07 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-19.rc4.dev.gitaea4f21
+- disable debuginfo temporarily
+
+* Fri Nov 03 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-18.rc4.dev.gitaea4f21
+- enable debuginfo
+
+* Wed Oct 25 2017 Dan Walsh <dwalsh@redhat.name> - 1.0.0-17.rc4.gitaea4f21
+- Add container-selinux prerequires to make sure runc is labeled correctly
+
+* Thu Oct 19 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-16.rc4.dev.gitaea4f21
+- correct the release tag "rc4dev" -> "rc4.dev" cause I'm OCD
+
+* Mon Oct 16 2017 Dan Walsh <dwalsh@redhat.com> - 1.0.0-15.rc4dev.gitaea4f21
+- Use the same checkout as Fedora for lates CRI-O
+
+* Fri Sep 22 2017 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.0.0-14.rc4dev.git84a082b
 - rebase to 84a082bfef6f932de921437815355186db37aeb1
 
 * Tue Jun 13 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-13.rc3.gitd40db12