diff --git a/components/packaging/Makefile b/components/packaging/Makefile
index 6ff35a8c7d..8550796eef 100644
--- a/components/packaging/Makefile
+++ b/components/packaging/Makefile
@@ -15,7 +15,7 @@ clean: ## remove build artifacts
 	$(MAKE) -C static clean
 
 .PHONY: rpm
-rpm: DOCKER_BUILD_PKGS:=fedora-27 fedora-26 fedora-25 centos-7
+rpm: DOCKER_BUILD_PKGS:=fedora-27 fedora-26 centos-7
 rpm: ## build rpm packages
 	for p in $(DOCKER_BUILD_PKGS); do \
 		$(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \
diff --git a/components/packaging/deb/common/control b/components/packaging/deb/common/control
index a3285cd0cf..a12448f1a8 100644
--- a/components/packaging/deb/common/control
+++ b/components/packaging/deb/common/control
@@ -14,6 +14,7 @@ Recommends: aufs-tools,
             ca-certificates,
             cgroupfs-mount | cgroup-lite,
             git,
+            pigz,
             xz-utils,
             ${apparmor:Recommends}
 Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs, docker-ee
diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec
index a1abe5c0fa..0456e3cb34 100644
--- a/components/packaging/rpm/centos-7/docker-ce.spec
+++ b/components/packaging/rpm/centos-7/docker-ce.spec
@@ -27,6 +27,7 @@ Requires: libcgroup
 Requires: systemd-units
 Requires: tar
 Requires: xz
+Requires: pigz
 
 # Resolves: rhbz#1165615
 Requires: device-mapper-libs >= 1.02.90-1
diff --git a/components/packaging/rpm/fedora-25/Dockerfile.aarch64 b/components/packaging/rpm/fedora-25/Dockerfile.aarch64
deleted file mode 100644
index b2cd91888e..0000000000
--- a/components/packaging/rpm/fedora-25/Dockerfile.aarch64
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM arm64v8/fedora:25
-RUN dnf -y upgrade
-RUN dnf install -y @development-tools fedora-packager
-RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common
-ENV GO_VERSION 1.9.2
-ENV DISTRO fedora
-ENV SUITE 25
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local
-ENV GOPATH /go
-ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS seccomp selinux
-RUN mkdir -p /go/src/github.com/docker && mkdir -p /go/src/github.com/opencontainers
-COPY docker-ce.spec /root/rpmbuild/SPECS/docker-ce.spec
-WORKDIR /root/rpmbuild
-ENTRYPOINT ["/bin/rpmbuild"]
diff --git a/components/packaging/rpm/fedora-26/docker-ce.spec b/components/packaging/rpm/fedora-26/docker-ce.spec
index 179e684a70..37e1ccf37d 100644
--- a/components/packaging/rpm/fedora-26/docker-ce.spec
+++ b/components/packaging/rpm/fedora-26/docker-ce.spec
@@ -26,6 +26,7 @@ Requires: libcgroup
 Requires: systemd-units
 Requires: tar
 Requires: xz
+Requires: pigz
 
 # Resolves: rhbz#1165615
 Requires: device-mapper-libs >= 1.02.90-1
diff --git a/components/packaging/rpm/fedora-27/docker-ce.spec b/components/packaging/rpm/fedora-27/docker-ce.spec
index 2a6c5a8d06..2c86cac2d9 100644
--- a/components/packaging/rpm/fedora-27/docker-ce.spec
+++ b/components/packaging/rpm/fedora-27/docker-ce.spec
@@ -27,6 +27,7 @@ Requires: libcgroup
 Requires: systemd-units
 Requires: tar
 Requires: xz
+Requires: pigz
 
 # Resolves: rhbz#1165615
 Requires: device-mapper-libs >= 1.02.90-1
diff --git a/components/packaging/rpm/gen-rpm-ver b/components/packaging/rpm/gen-rpm-ver
index cb8af2ba25..87883c30d5 100755
--- a/components/packaging/rpm/gen-rpm-ver
+++ b/components/packaging/rpm/gen-rpm-ver
@@ -39,10 +39,10 @@ if [[ "$rpmVersion" == *-dev ]] || [ -n "$($GIT_COMMAND status --porcelain)" ];
     gitUnix="$($GIT_COMMAND log -1 --pretty='%at')"
     gitDate="$($DATE_COMMAND --date "@$gitUnix" +'%Y%m%d.%H%M%S')"
     gitCommit="$($GIT_COMMAND log -1 --pretty='%h')"
-    gitVersion="${gitDate}.git${gitCommit}"
+    gitVersion="git${gitDate}.0.${gitCommit}"
     # gitVersion is now something like '20150128.112847.17e840a'
     rpmVersion="${rpmVersion%-dev}"
-    rpmRelease="0.0.$gitVersion"
+    rpmRelease="0.0.dev.$gitVersion"
 fi
 
 # Replace any other dashes with periods