diff --git a/flannel.spec b/flannel.spec
index 1d03089..10939ba 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -31,7 +31,7 @@
 
 Name:           flannel 
 Version:        0.5.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Etcd address management agent for overlay networks
 License:        ASL 2.0 
 URL:            https://%{provider_prefix}
@@ -281,6 +281,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %endif
 
 %changelog
+* Fri Oct 30 2015 jchaloup <jchaloup@redhat.com> - 0.5.4-2
+- Add Restart=on-failure to flanned.service file
+
 * Tue Oct 20 2015 jchaloup <jchaloup@redhat.com> - 0.5.4-1
 - Update to v0.5.4
   resolves: #1273211
diff --git a/flanneld.service b/flanneld.service
index d105609..540cd56 100644
--- a/flanneld.service
+++ b/flanneld.service
@@ -10,6 +10,7 @@ EnvironmentFile=/etc/sysconfig/flanneld
 EnvironmentFile=-/etc/sysconfig/docker-network
 ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD} -etcd-prefix=${FLANNEL_ETCD_KEY} $FLANNEL_OPTIONS
 ExecStartPost=/usr/libexec/flannel/mk-docker-opts.sh -k DOCKER_NETWORK_OPTIONS -d /run/flannel/docker
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target