diff --git a/.flannel.metadata b/.flannel.metadata
index 5d70a2d..a5a9957 100644
--- a/.flannel.metadata
+++ b/.flannel.metadata
@@ -1 +1 @@
-758f851bc0910a31837664fee04a0a8b14cc4cf3 SOURCES/flannel-29ffccc.tar.gz
+e8414f009ef28eea7c7a0f17235167186caaaa58 SOURCES/flannel-cb8284f.tar.gz
diff --git a/.gitignore b/.gitignore
index caead23..faa820a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/flannel-29ffccc.tar.gz
+SOURCES/flannel-cb8284f.tar.gz
diff --git a/SOURCES/Notify-systemd-service-when-server-is-ready-to-liste.patch b/SOURCES/Notify-systemd-service-when-server-is-ready-to-liste.patch
deleted file mode 100644
index 22655a3..0000000
--- a/SOURCES/Notify-systemd-service-when-server-is-ready-to-liste.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c623d5666ef076de1b79c7b86d72a9d68847f672 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Wed, 23 Sep 2015 09:40:46 +0200
-Subject: [PATCH] Notify systemd service when server is ready to listen
-
----
- remote/server.go | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/remote/server.go b/remote/server.go
-index a39f80c..6d6fb05 100644
---- a/remote/server.go
-+++ b/remote/server.go
-@@ -26,6 +26,7 @@ import (
- 
- 	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport"
- 	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/activation"
-+	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon"
- 	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
- 	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/gorilla/mux"
- 	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
-@@ -276,6 +277,8 @@ func RunServer(ctx context.Context, sm subnet.Manager, listenAddr, cafile, certf
- 		c <- http.Serve(l, httpLogger(r))
- 	}()
- 
-+	daemon.SdNotify("READY=1")
-+
- 	select {
- 	case <-ctx.Done():
- 		l.Close()
--- 
-1.9.3
-
diff --git a/SOURCES/flanneld.service b/SOURCES/flanneld.service
index c60a72b..f945928 100644
--- a/SOURCES/flanneld.service
+++ b/SOURCES/flanneld.service
@@ -10,7 +10,7 @@ Before=docker.service
 Type=notify
 EnvironmentFile=/etc/sysconfig/flanneld
 EnvironmentFile=-/etc/sysconfig/docker-network
-ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD} -etcd-prefix=${FLANNEL_ETCD_KEY} $FLANNEL_OPTIONS
+ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD_ENDPOINTS} -etcd-prefix=${FLANNEL_ETCD_PREFIX} $FLANNEL_OPTIONS
 ExecStartPost=/usr/libexec/flannel/mk-docker-opts.sh -k DOCKER_NETWORK_OPTIONS -d /run/flannel/docker
 Restart=on-failure
 
diff --git a/SOURCES/flanneld.sysconf b/SOURCES/flanneld.sysconf
index dde67f5..a0f6848 100644
--- a/SOURCES/flanneld.sysconf
+++ b/SOURCES/flanneld.sysconf
@@ -1,11 +1,11 @@
 # Flanneld configuration options  
 
 # etcd url location.  Point this to the server where etcd runs
-FLANNEL_ETCD="http://127.0.0.1:2379"
+FLANNEL_ETCD_ENDPOINTS="http://127.0.0.1:2379"
 
 # etcd config key.  This is the configuration key that flannel queries
 # For address range assignment
-FLANNEL_ETCD_KEY="/atomic.io/network"
+FLANNEL_ETCD_PREFIX="/atomic.io/network"
 
 # Any additional options that you want to pass
 #FLANNEL_OPTIONS=""
diff --git a/SPECS/flannel.spec b/SPECS/flannel.spec
index 942f3c3..762a14f 100644
--- a/SPECS/flannel.spec
+++ b/SPECS/flannel.spec
@@ -14,14 +14,14 @@
 %global project         coreos
 %global repo            flannel
 %global import_path     %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit          29ffccc484cd46b6bc2d5a5b9d23e3e2f3f2851c
+%global commit          cb8284fb60737793596dd2fc98d9608d3d0d66f0
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global devel_main      flannel-devel
 
 Name:           flannel 
-Version:        0.5.3
-Release:        9%{?dist}
+Version:        0.5.5
+Release:        1%{?dist}
 Summary:        Etcd address management agent for overlay networks
 License:        ASL 2.0 
 URL:            https://%{import_path}
@@ -34,7 +34,6 @@ Source4:        flannel-tmpfiles.conf
 
 Patch0:         change-4001-to-2379-in-help-and-README.patch
 Patch1:         change-coreos.com-network-to-atomic.io-network-in-he.patch
-Patch2:         Notify-systemd-service-when-server-is-ready-to-liste.patch
 Patch3:         internal-to-inteernal.patch
 
 ExclusiveArch:  %{ix86} x86_64 %{arm}
@@ -129,7 +128,6 @@ building other packages which use %{project}/%{repo}.
 %setup -q -n %{repo}-%{commit}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 %if ! 0%{?with_bundled}
@@ -194,6 +192,7 @@ go test %{import_path}/subnet
 %{_unitdir}/flanneld.service
 %{_unitdir}/docker.service.d/flannel.conf
 %{_libexecdir}/flannel/mk-docker-opts.sh
+%dir %{_libexecdir}/flannel
 %config(noreplace) %{_sysconfdir}/sysconfig/flanneld
 %dir /run/%{name}/
 %{_tmpfilesdir}/%{name}.conf
@@ -207,6 +206,15 @@ go test %{import_path}/subnet
 %endif
 
 %changelog
+* Wed Sep 07 2016 jchaloup <jchaloup@redhat.com> - 0.5.5-1
+- Update to flannel v5.5.0
+  resolves: #1373915
+
+* Wed Jun 29 2016 jchaloup <jchaloup@redhat.com> - 0.5.3-10
+- Own /usr/libexec/flannel directory
+- make envs in service and config file canonical
+  resolves: #1341223
+
 * Thu Jan 14 2016 jchaloup <jchaloup@redhat.com> - 0.5.3-9
 - Build with debug-info support
   resolves: #1298728