diff --git a/.docker-distribution.metadata b/.docker-distribution.metadata
index 9ac7d62..26f36ab 100644
--- a/.docker-distribution.metadata
+++ b/.docker-distribution.metadata
@@ -1 +1 @@
-86b743877f3886f8400123d572789120a9814500 SOURCES/36936218c2e6a4527fc99a5c04126bb1f4c7d55c.tar.gz
+09b54685de6ab75c9d3afe131a8b92ad82f963e1 SOURCES/3f7fa41272784c4442697efffeff001a6f1b9857.tar.gz
diff --git a/.gitignore b/.gitignore
index 5d6cdff..fefcd74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/36936218c2e6a4527fc99a5c04126bb1f4c7d55c.tar.gz
+SOURCES/3f7fa41272784c4442697efffeff001a6f1b9857.tar.gz
diff --git a/SOURCES/docker-distribution.service b/SOURCES/docker-distribution.service
index ebeedd0..f2f1d4b 100644
--- a/SOURCES/docker-distribution.service
+++ b/SOURCES/docker-distribution.service
@@ -3,7 +3,7 @@ Description=v2 Registry server for Docker
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/registry /etc/docker-distribution/registry/config.yml
+ExecStart=/usr/bin/registry serve /etc/docker-distribution/registry/config.yml
 Restart=on-failure
 
 [Install]
diff --git a/SPECS/docker-distribution.spec b/SPECS/docker-distribution.spec
index 91736e1..9b6207f 100644
--- a/SPECS/docker-distribution.spec
+++ b/SPECS/docker-distribution.spec
@@ -33,12 +33,12 @@
 # https://github.com/docker/distribution
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          36936218c2e6a4527fc99a5c04126bb1f4c7d55c
+%global commit          3f7fa41272784c4442697efffeff001a6f1b9857
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           %{project}-%{repo}
-Version:        2.3.1
-Release:        1%{?dist}
+Version:        2.4.0
+Release:        2%{?dist}
 Summary:        Docker toolset to pack, ship, store, and deliver content
 License:        ASL 2.0
 URL:            https://%{provider_prefix}
@@ -49,6 +49,8 @@ BuildRequires: systemd
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
+Obsoletes:      docker-registry <= 0.9.1-7
+Provides:       docker-registry = %{version}-%{release}
 
 
 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
@@ -219,6 +221,11 @@ providing packages with %{import_path} prefix.
 %prep
 %setup -q -n %{repo}-%{commit}
 
+pushd vendor
+mkdir src
+mv g* src/.
+popd
+
 %build
 mkdir _build
 
@@ -230,7 +237,7 @@ popd
 %if ! 0%{?with_bundled}
 export GOPATH=$(pwd)/_build:%{gopath}
 %else
-export GOPATH=$(pwd)/_build:$(pwd)/Godeps/_workspace:%{gopath}
+export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
 %endif
 
 pushd _build/src/%{import_path}/cmd/registry
@@ -331,6 +338,14 @@ make test
 %endif
 
 %changelog
+* Thu Apr 28 2016 Lokesh Mandvekar <lsm5@redhat.com> - 2.4.0-2
+- Resolves: #1330393 - update unitfile ExecStart
+- From: Luwen Su <lsu@redhat.com>
+
+* Tue Apr 19 2016 Lokesh Mandvekar <lsm5@redhat.com> - 2.4.0-1
+- Resolves: rhbz#1328475 - rebase to v2.4.0
+- Resolves: rhbz#1328526 - obsoletes docker-registry <= 0.9.1-7
+
 * Tue Mar 08 2016 Lokesh Mandvekar <lsm5@redhat.com> - 2.3.1-1
 - Resolves: rhbz#1315881 - rebase to v2.3.1