diff --git a/.gitignore b/.gitignore
index 1e3787e..35d9685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /cri-o-36dfef5.tar.gz
 /cri-o-2e6070f.tar.gz
 /cri-o-b9dc097.tar.gz
+/cri-o-7cc8492.tar.gz
diff --git a/ocid.spec b/ocid.spec
index 41cf6e5..ea08fff 100644
--- a/ocid.spec
+++ b/ocid.spec
@@ -25,7 +25,7 @@
 # https://github.com/kubernetes-incubator/cri-o
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit0         b9dc097c40fff1a1bf19e9c8b355388a6804069e
+%global commit0         7cc84922b3ef896e32bf56dd16ceb9fddcb18cb2
 %global shortcommit0    %(c=%{commit0}; echo ${c:0:7})
 
 %global git1            https://github.com/containernetworking/cni
@@ -35,7 +35,7 @@
 
 Name:           ocid
 Version:        0
-Release:        0.9.git%{shortcommit0}%{?dist}
+Release:        0.10.git%{shortcommit0}%{?dist}
 Summary:        OCI-based implementation of Kubernetes Container Runtime Interface
 License:        ASL 2.0
 URL:            https://%{provider_prefix}
@@ -420,14 +420,24 @@ cp %{SOURCE3} contrib/systemd/.
 tar zxf %{SOURCE2}
 
 %build
+mkdir _build
+pushd _build
+mkdir -p src/%{provider}.%{provider_tld}/%{project}
+ln -s $(dirs +1 -l) src/%{import_path}
+popd
+
+ln -s vendor src
+
+export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
 make all
 
 pushd cni-%{commit1}
 ./build
 
 %install
-%make_install
-%make_install install.systemd
+export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
+
+%make_install DESTDIR=%{buildroot} PREFIX=%{buildroot}/usr install.config install.systemd
 
 install -dp %{buildroot}%{_libexecdir}/%{name}/cni
 install -p -m 755 cni-%{commit1}/bin/* %{buildroot}%{_libexecdir}/%{name}/cni
@@ -525,6 +535,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %dir %{_sharedstatedir}/containers
 
 %changelog
+* Thu Jan 19 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.10.git7cc8492
+- built commit 7cc8492
+- packaging fixes from Nalin Dahyabhai <nalin@redhat.com>
+
 * Thu Jan 19 2017 Dan Walsh <dwalsh@redhat.com> - 0-0.9.gitb9dc097
 - Change to require skopeo-containers
 - Merge Nalind/storage patch
diff --git a/sources b/sources
index 2ebd8a4..9c36432 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 SHA512 (cni-98ff61a.tar.gz) = 7ab7b3613819e6aa34660d578bb5bf584ef3b917e17baaf36ded26270a8f5a780750c35e889d28fde8fbd523d2e4a739129d0a69ae9720d5cceed366553cf014
-SHA512 (cri-o-2e6070f.tar.gz) = dd08d9a9cf97658819f233ce46496979bb6356e0f1ab2a6568d21b9762e209ff7ad8fcc2b7f0100baa40665ec9327a472737717a9c97b5dc18f9df81f7006340
-SHA512 (cri-o-b9dc097.tar.gz) = cd119ff5041cdda9680c00027410333043111548cf37315073b1834500a76312fb43db363d838b07039e57514f2debaf35fc7100ffe7d1336c93f5b4eed9b070
+SHA512 (cri-o-7cc8492.tar.gz) = 570696fcc5406706ff9b0e00ad916726f77c703dd2256ccebeedfbc4310fbf9a770d325337211df07a55f42e67d4e1f4bffb00b44cb01f5e068f10f63c012bd5