diff --git a/.gitignore b/.gitignore
index dddddbb..2e1e389 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/flannel-cb8284f.tar.gz
-/flannel-3b9ac98.tar.gz
+/flannel-d9560b0.tar.gz
diff --git a/flannel.spec b/flannel.spec
index 9110601..a8f69d9 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -35,15 +35,15 @@
 %global repo            flannel
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          3b9ac987436d010774ee660929c2b58cd70cd8ab
+%global commit          d9560b051b0abe92048ae5c72b5fbd71ba7b8f17
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global devel_main      flannel-devel
-%global aws_commit      5c0313fff8cd85670ae4fc996254dd7d66cb4cf7
+%global k8s_commit      44368db9916cc345ebef8b6fbde3cdf0dc9d79dc
 
 Name:           flannel 
-Version:        0.6.2
-Release:        2%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        Etcd address management agent for overlay networks
 License:        ASL 2.0 
 URL:            https://%{provider_prefix}
@@ -62,10 +62,11 @@ ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
 
 BuildRequires:      golang >= 1.2.7
 %if ! 0%{?with_bundled}
-#BuildRequires:      golang(github.com/aws/aws-sdk-go/aws)
-#BuildRequires:      golang(github.com/aws/aws-sdk-go/aws/awserr)
-#BuildRequires:      golang(github.com/aws/aws-sdk-go/aws/ec2metadata)
-#BuildRequires:      golang(github.com/aws/aws-sdk-go/service/ec2)
+BuildRequires:      golang(github.com/aws/aws-sdk-go/aws)
+BuildRequires:      golang(github.com/aws/aws-sdk-go/aws/awserr)
+BuildRequires:      golang(github.com/aws/aws-sdk-go/aws/ec2metadata)
+BuildRequires:      golang(github.com/aws/aws-sdk-go/aws/session)
+BuildRequires:      golang(github.com/aws/aws-sdk-go/service/ec2)
 BuildRequires:      golang(github.com/coreos/etcd/client)
 BuildRequires:      golang(github.com/coreos/etcd/pkg/transport)
 BuildRequires:      golang(github.com/coreos/go-iptables/iptables)
@@ -82,6 +83,15 @@ BuildRequires:      golang(golang.org/x/oauth2)
 BuildRequires:      golang(golang.org/x/oauth2/google)
 BuildRequires:      golang(google.golang.org/api/compute/v1)
 BuildRequires:      golang(google.golang.org/api/googleapi)
+#BuildRequires:      golang(k8s.io/kubernetes/pkg/api)
+#BuildRequires:      golang(k8s.io/kubernetes/pkg/client/cache)
+#BuildRequires:      golang(k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset)
+#BuildRequires:      golang(k8s.io/kubernetes/pkg/client/restclient)
+#BuildRequires:      golang(k8s.io/kubernetes/pkg/controller/framework)
+#BuildRequires:      golang(k8s.io/kubernetes/pkg/runtime)
+#BuildRequires:      golang(k8s.io/kubernetes/pkg/util/runtime)
+#BuildRequires:      golang(k8s.io/kubernetes/pkg/util/wait)
+#BuildRequires:      golang(k8s.io/kubernetes/pkg/watch)
 %endif
 
 BuildRequires:      pkgconfig(systemd)
@@ -101,10 +111,11 @@ Summary:       %{summary}
 BuildArch:     noarch
 
 %if 0%{?with_check}
-#BuildRequires: golang(github.com/aws/aws-sdk-go/aws)
-#BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr)
-#BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata)
-#BuildRequires: golang(github.com/aws/aws-sdk-go/service/ec2)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata)
+BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session)
+BuildRequires: golang(github.com/aws/aws-sdk-go/service/ec2)
 BuildRequires: golang(github.com/coreos/etcd/client)
 BuildRequires: golang(github.com/coreos/etcd/pkg/transport)
 BuildRequires: golang(github.com/coreos/go-iptables/iptables)
@@ -120,11 +131,21 @@ BuildRequires: golang(golang.org/x/oauth2)
 BuildRequires: golang(golang.org/x/oauth2/google)
 BuildRequires: golang(google.golang.org/api/compute/v1)
 BuildRequires: golang(google.golang.org/api/googleapi)
+#BuildRequires: golang(k8s.io/kubernetes/pkg/api)
+#BuildRequires: golang(k8s.io/kubernetes/pkg/client/cache)
+#BuildRequires: golang(k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset)
+#BuildRequires: golang(k8s.io/kubernetes/pkg/client/restclient)
+#BuildRequires: golang(k8s.io/kubernetes/pkg/controller/framework)
+#BuildRequires: golang(k8s.io/kubernetes/pkg/runtime)
+#BuildRequires: golang(k8s.io/kubernetes/pkg/util/runtime)
+#BuildRequires: golang(k8s.io/kubernetes/pkg/util/wait)
+#BuildRequires: golang(k8s.io/kubernetes/pkg/watch)
 %endif
 
 Requires: golang(github.com/aws/aws-sdk-go/aws)
 Requires: golang(github.com/aws/aws-sdk-go/aws/awserr)
 Requires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata)
+Requires: golang(github.com/aws/aws-sdk-go/aws/session)
 Requires: golang(github.com/aws/aws-sdk-go/service/ec2)
 Requires: golang(github.com/coreos/etcd/client)
 Requires: golang(github.com/coreos/etcd/pkg/transport)
@@ -141,6 +162,15 @@ Requires: golang(golang.org/x/oauth2)
 Requires: golang(golang.org/x/oauth2/google)
 Requires: golang(google.golang.org/api/compute/v1)
 Requires: golang(google.golang.org/api/googleapi)
+#Requires: golang(k8s.io/kubernetes/pkg/api)
+#Requires: golang(k8s.io/kubernetes/pkg/client/cache)
+#Requires: golang(k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset)
+#Requires: golang(k8s.io/kubernetes/pkg/client/restclient)
+#Requires: golang(k8s.io/kubernetes/pkg/controller/framework)
+#Requires: golang(k8s.io/kubernetes/pkg/runtime)
+#Requires: golang(k8s.io/kubernetes/pkg/util/runtime)
+#Requires: golang(k8s.io/kubernetes/pkg/util/wait)
+#Requires: golang(k8s.io/kubernetes/pkg/watch)
 
 Provides: golang(%{import_path}/backend) = %{version}-%{release}
 Provides: golang(%{import_path}/backend/alloc) = %{version}-%{release}
@@ -153,11 +183,17 @@ Provides: golang(%{import_path}/network) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/ip) = %{version}-%{release}
 Provides: golang(%{import_path}/remote) = %{version}-%{release}
 Provides: golang(%{import_path}/subnet) = %{version}-%{release}
+Provides: golang(%{import_path}/subnet/kube) = %{version}-%{release}
 Provides: golang(%{import_path}/version) = %{version}-%{release}
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = %{aws_commit}
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = %{aws_commit}
-Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = %{aws_commit}
-Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ec2)) = %{aws_commit}
+Provides: bundled(golang(k8s.io/kubernetes/pkg/api)) = %{k8s_commit}
+Provides: bundled(golang(k8s.io/kubernetes/pkg/client/cache)) = %{k8s_commit}
+Provides: bundled(golang(k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset)) = %{k8s_commit}
+Provides: bundled(golang(k8s.io/kubernetes/pkg/client/restclient)) = %{k8s_commit}
+Provides: bundled(golang(k8s.io/kubernetes/pkg/controller/framework)) = %{k8s_commit}
+Provides: bundled(golang(k8s.io/kubernetes/pkg/runtime)) = %{k8s_commit}
+Provides: bundled(golang(k8s.io/kubernetes/pkg/util/runtime)) = %{k8s_commit}
+Provides: bundled(golang(k8s.io/kubernetes/pkg/util/wait)) = %{k8s_commit}
+Provides: bundled(golang(k8s.io/kubernetes/pkg/watch)) = %{k8s_commit}
 
 %description devel
 Flannel is an etcd driven address management agent. Most commonly it is used to
@@ -309,10 +345,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %if 0%{?with_unit_test} && 0%{?with_devel}
 %files unit-test-devel -f unit-test-devel.file-list
 %license LICENSE
-%doc README.md
 %endif
 
 %changelog
+* Wed Jan 11 2017 Jan Chaloupka <jchaloup@redhat.com> - 0.7.0-1
+- Bump to 0.7.0
+  resolves: #1412005
+
 * Tue Jan 03 2017 Jan Chaloupka <jchaloup@redhat.com> - 0.6.2-2
 - Patch pkg/ip to build and run on s390x
   resolves: #1348906
diff --git a/sources b/sources
index a163db2..c5f6ffb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flannel-3b9ac98.tar.gz) = 176253e81321a555b83c6ba0cd94fd5256aec9b0c1536e2df7fcfac01263db7155fde6b61a1542ee57df894217526af4e1e7090995e87b0cd77e9e5517e16599
+SHA512 (flannel-d9560b0.tar.gz) = 7460ede64ed58411aeec72c9be2291b8ac6bfe9d10290d5b5a4ff8a36022307b8ff2ffda0afd4e98b81348a1acb854cf2609ffc31076eb9422fd1250d2baa4d8