diff --git a/.abf.yml b/.abf.yml
index bf37952..a1051d0 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,3 @@
 sources:
-  v1.11.2.tar.gz: 3725a90651a4eabb4784fc252f3090af53a91339
+  v1.6.2.tar.gz: 030c87e48835e6fcb54c44d6ba250c1764bcda1a
+  libnetwork-20170523.tar.xz: 1d6cfa291a9ed3b83fa9d5a35f3ae5064716a0ab
\ No newline at end of file
diff --git a/docker.service b/docker.service
index d3e8914..e1f08f2 100644
--- a/docker.service
+++ b/docker.service
@@ -10,7 +10,7 @@ EnvironmentFile=-/etc/sysconfig/docker
 EnvironmentFile=-/etc/sysconfig/docker-storage
 EnvironmentFile=-/etc/sysconfig/docker-network
 Environment=GOTRACEBACK=crash
-ExecStart=/usr/bin/docker daemon \
+ExecStart=/usr/bin/dockerd \
           $OPTIONS \
           $DOCKER_STORAGE_OPTIONS \
           $DOCKER_NETWORK_OPTIONS \
diff --git a/docker.spec b/docker.spec
index bfd8d7c..6befa72 100644
--- a/docker.spec
+++ b/docker.spec
@@ -1,10 +1,11 @@
 # modifying the dockerinit binary breaks the SHA1 sum check by docker
 %global __os_install_post %{_usrlibrpm}/brp-compress
-%global dist_version 1.11.2
+%global dist_version 17.05.0
 
 
 # docker builds in a checksum of dockerinit into docker,
 # so stripping the binaries breaks docker
+#debuginfo not supported with Go
 %global debug_package %{nil}
 %global provider github
 %global provider_tld com
@@ -12,18 +13,22 @@
 %global repo %{project}
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 
-#debuginfo not supported with Go
+
 %global gopath  %{_libdir}/golang
 %define gosrc %{gopath}/src/pkg/%{import_path}
+%define go_dir %{gopath}
 
-%global commit      a34a1d598c6096ed8b5ce5219e77d68e5cd85462
+%global commit      4dc5990d7565a4a15d641bc6a0bc50a02cfcf302
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %define __noautoreq '.*/bin/make'
 
+%define libnetwork_date 20170523
+
+
 Name:           docker
 Version:        %{dist_version}
-Release:        4
+Release:        3
 Summary:        Automates deployment of containerized applications
 License:        ASL 2.0
 Group:		System/Kernel and hardware
@@ -31,16 +36,20 @@ Group:		System/Kernel and hardware
 URL:            http://www.docker.com
 # only x86_64 for now: https://github.com/docker/docker/issues/136
 #ExclusiveArch:  x86_64
-Source0:	https://%{import_path}/archive/v%{dist_version}.tar.gz
+Source0:	https://%{import_path}/archive/v%{dist_version}-ce.tar.gz
 #Source0:        https://%{import_path}/archive/%{commit}.tar.gzS
 
-Source1: %{repo}.service
-Source2: %{repo}.sysconfig
-Source3: %{repo}-storage.sysconfig
-Source4: %{repo}-logrotate.sh
-Source5: README.%{repo}-logrotate
-Source6: %{repo}-network.sysconfig
-Source7: %{repo}.socket
+#Source1: %{repo}.service
+#Source2: %{repo}.sysconfig
+#Source3: %{repo}-storage.sysconfig
+#Source4: %{repo}-logrotate.sh
+#Source5: README.%{repo}-logrotate
+#Source6: %{repo}-network.sysconfig
+#Source7: %{repo}.socket
+
+Source2:	docker.conf
+Source3:	libnetwork-20170523.tar.xz
+Patch0:		adjust-docker-service.patch
 Source100:	%{name}.rpmlintrc
 
 BuildRequires:  gcc
@@ -48,8 +57,10 @@ BuildRequires:  glibc-static-devel
 
 # ensure build uses golang 1.4 or above
 BuildRequires:  golang >= 1.4
+BuildRequires:	pkgconfig(sqlite3)
 
-BuildRequires:  sqlite3-devel
+Requires:	runc
+# Requires:	containerd
 
 BuildRequires:  golang-net-devel
 BuildRequires:  go-md2man
@@ -73,11 +84,13 @@ Requires:       lxc
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1034919
 # No longer needed in Fedora because of libcontainer
-Requires:       libcgroup
-Provides:       lxc-docker = %{version}
+Requires:	cgroup
+Requires:	e2fsprogs
+Requires:	iptables
 
-Obsoletes: docker-io < 1.2.0-8
-Provides: docker-io = %{version}-%{release}
+
+Obsoletes:	docker-io < 1.2.0-8
+Provides:	docker-io = %{version}-%{release}
 
 %description
 Docker is an open-source engine that automates the deployment of any
@@ -94,94 +107,77 @@ BuildRequires:  golang >= 1.4
 Requires:       golang >= 1.4
 Requires:       docker-pkg-devel
 Summary:        A golang registry for global request variables (source libraries)
-Provides: %{repo}-pkg-devel = %{version}-%{release}
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/builder) = %{version}-%{release}
-Provides: golang(%{import_path}/builder/parser) = %{version}-%{release}
-Provides: golang(%{import_path}/builder/parser/dumper) = %{version}-%{release}
-Provides: golang(%{import_path}/builder/command) = %{version}-%{release}
-Provides: golang(%{import_path}/nat) = %{version}-%{release}
-Provides: golang(%{import_path}/utils) = %{version}-%{release}
-Provides: golang(%{import_path}/integration-cli) = %{version}-%{release}
-Provides: golang(%{import_path}/trust) = %{version}-%{release}
-Provides: golang(%{import_path}/events) = %{version}-%{release}
-Provides: golang(%{import_path}/volumes) = %{version}-%{release}
-Provides: golang(%{import_path}/engine) = %{version}-%{release}
-Provides: golang(%{import_path}/registry) = %{version}-%{release}
-Provides: golang(%{import_path}/registry/v2) = %{version}-%{release}
-Provides: golang(%{import_path}/api) = %{version}-%{release}
-Provides: golang(%{import_path}/api/client) = %{version}-%{release}
-Provides: golang(%{import_path}/api/stats) = %{version}-%{release}
-Provides: golang(%{import_path}/api/server) = %{version}-%{release}
-Provides: golang(%{import_path}/opts) = %{version}-%{release}
-Provides: golang(%{import_path}/builtins) = %{version}-%{release}
-Provides: golang(%{import_path}/runconfig) = %{version}-%{release}
-Provides: golang(%{import_path}/docker) = %{version}-%{release}
-Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
-Provides: golang(%{import_path}/contrib/host-integration) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/devmapper) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/overlay) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/vfs) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/btrfs) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/graphdriver/graphtest) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/networkdriver) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/networkdriver/ipallocator) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/networkdriver/portmapper) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/networkdriver/bridge) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/networkdriver/portallocator) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/devicemapper) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/units) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/chrootarchive) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/mount) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/systemd) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/parsers) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/parsers/kernel) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/parsers/operatingsystem) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/parsers/filters) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/broadcastwriter) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/stdcopy) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/promise) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/pools) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/system) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/fileutils) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/mflag) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/mflag/example) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/timeutils) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/ioutils) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/pubsub) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/signal) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/httputils) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/urlutil) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/sysinfo) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/archive) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/iptables) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/tailfile) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/graphdb) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/tarsum) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/namesgenerator) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/jsonlog) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/testutils) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/truncindex) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/homedir) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/symlink) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/networkfs/resolvconf) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/networkfs/etchosts) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/term) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/reexec) = %{version}-%{release}
-Provides: golang(%{import_path}/integration) = %{version}-%{release}
-Provides: golang(%{import_path}/links) = %{version}-%{release}
-Provides: golang(%{import_path}/image) = %{version}-%{release}
+Provides:       %{repo}-pkg-devel = %{version}-%{release}
+Provides:       golang(%{import_path}) = %{version}-%{release}
+Provides:       golang(%{import_path}/api) = %{version}-%{release}
+Provides:       golang(%{import_path}/api/client) = %{version}-%{release}
+Provides:       golang(%{import_path}/api/server) = %{version}-%{release}
+Provides:       golang(%{import_path}/api/types) = %{version}-%{release}
+Provides:       golang(%{import_path}/archive) = %{version}-%{release}
+Provides:       golang(%{import_path}/builtins) = %{version}-%{release}
+Provides:       golang(%{import_path}/contrib) = %{version}-%{release}
+Provides:       golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
+Provides:       golang(%{import_path}/contrib/host-integration) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/execdriver) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/graphdriver) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/graphdriver/btrfs) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/graphdriver/devmapper) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/graphdriver/overlay) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/graphdriver/graphtest) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/graphdriver/vfs) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/logger) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/logger/jsonfilelog) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/logger/syslog) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/networkdriver) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/networkdriver/bridge) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/networkdriver/ipallocator) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/networkdriver/portallocator) = %{version}-%{release}
+Provides:       golang(%{import_path}/daemon/networkdriver/portmapper) = %{version}-%{release}
+Provides:       golang(%{import_path}/dockerversion) = %{version}-%{release}
+Provides:       golang(%{import_path}/engine) = %{version}-%{release}
+Provides:       golang(%{import_path}/graph) = %{version}-%{release}
+Provides:       golang(%{import_path}/image) = %{version}-%{release}
+Provides:       golang(%{import_path}/integration) = %{version}-%{release}
+Provides:       golang(%{import_path}/integration-cli) = %{version}-%{release}
+Provides:       golang(%{import_path}/links) = %{version}-%{release}
+Provides:       golang(%{import_path}/nat) = %{version}-%{release}
+Provides:       golang(%{import_path}/opts) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/term) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/term/winconsole) = %{version}-%{release}
+Provides:       golang(%{import_path}/registry) = %{version}-%{release}
+Provides:       golang(%{import_path}/registry/v2) = %{version}-%{release}
+Provides:       golang(%{import_path}/runconfig) = %{version}-%{release}
+Provides:       golang(%{import_path}/utils) = %{version}-%{release}
+Provides:       golang(%{import_path}/utils/broadcastwriter) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/graphdb) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/iptables) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/listenbuffer) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/mflag) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/mflag/example) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/mount) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/namesgenerator) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/networkfs/etchosts) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/networkfs/resolvconf) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/proxy) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/signal) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/symlink) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/sysinfo) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/system) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/systemd) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/tailfile) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/term) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/testutils) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/truncindex) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/units) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/user) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/version) = %{version}-%{release}
 
 %description devel
 This is the source libraries for docker.
@@ -233,28 +229,37 @@ This package installs %{summary}.
 
 
 %prep
-%setup -q -n docker-%{dist_version}
+%setup -q -n moby-%{dist_version}-ce
+%apply_patches
 
-# here keep the new line above otherwise autosetup fails when applying patch
-cp %{SOURCE5} .
-#sed -i 's/$/%{?dist}/' VERSION
+tar -xf %{SOURCE3} -C vendor/github.com/
 
 %build
 export DOCKER_GITCOMMIT="%{shortcommit}"
-#export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
+
+export CGO_CFLAGS="-I%{_includedir}"
+export CGO_LDFLAGS="-L%{_libdir}"
+
 
 AUTO_GOPATH=1 ./hack/make.sh dynbinary
 man/md2man-all.sh
 cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax
 cp contrib/syntax/vim/README.md README-vim-syntax.md
 
+echo "build docker-proxy"
+export GOPATH=$(pwd)
+ln -s vendor src
+go build -ldflags='-linkmode=external' github.com/libnetwork/cmd/proxy
+
 %install
 # install binary
 install -d %{buildroot}%{_bindir}
-install -p -m 755 bundles/%{dist_version}/dynbinary/docker-%{dist_version} %{buildroot}%{_bindir}/docker
+install -p -m 755 bundles/%{version}-ce/dynbinary-client/docker-%{version}-ce %{buildroot}%{_bindir}/docker
+install -p -m 755 bundles/%{version}-ce/dynbinary-daemon/dockerd-%{version}-ce %{buildroot}%{_bindir}/dockerd
+install -p -m 755 proxy %{buildroot}%{_bindir}/docker-proxy
 
 # Place to store images
-install -d %{buildroot}%{_var}/cache/docker
+install -d %{buildroot}%{_libexecdir}/cache/docker
 
 # install manpages
 install -d %{buildroot}%{_mandir}/man1
@@ -274,10 +279,6 @@ install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_sysconfdir}/bash
 install -dp %{buildroot}%{_datadir}/fish/vendor_completions.d
 install -p -m 644 contrib/completion/fish/%{repo}.fish %{buildroot}%{_datadir}/fish/vendor_completions.d
 
-# install container logrotate cron script
-install -dp %{buildroot}%{_sysconfdir}/cron.daily/
-install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/cron.daily/%{repo}-logrotate
-
 # install vim syntax highlighting
 install -d %{buildroot}%{_datadir}/vim/vimfiles/{doc,ftdetect,syntax}
 install -p -m 644 contrib/syntax/vim/doc/dockerfile.txt %{buildroot}%{_datadir}/vim/vimfiles/doc
@@ -295,34 +296,27 @@ install -p -m 755 contrib/udev/80-docker.rules %{buildroot}%{_udevrulesdir}
 install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
 # install systemd/init scripts
 install -d %{buildroot}%{_unitdir}
-install -p -m 644 %{SOURCE1} %{SOURCE7} %{buildroot}%{_unitdir}
-
-# for additional args
-install -d %{buildroot}%{_sysconfdir}/sysconfig/
-install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{repo}
-install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/%{repo}-network
-install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{repo}-storage
-
-install -d -m 0755 %{buildroot}%{_sharedstatedir}/docker-unit-test/
-cp -pav VERSION Dockerfile %{buildroot}%{_sharedstatedir}/docker-unit-test/.
-for d in api builder cliconfig contrib daemon hack image integration-cli opts pkg registry runconfig utils vendor volume; do
-  cp -a $d %{buildroot}%{_sharedstatedir}/docker-unit-test/
-done
-# remove docker.initd as it requires /sbin/runtime no packages in Fedora
-rm -rf %{buildroot}%{_sharedstatedir}/docker-unit-test/contrib/init/openrc/docker.initd
+install -p -m 644 contrib/init/systemd/docker.service.rpm %{buildroot}%{_unitdir}/docker.service
+install -p -m 644 contrib/init/systemd/docker.socket %{buildroot}%{_unitdir}
 
 # sources
-install -d -p %{buildroot}%{gopath}/src/%{import_path}
-rm -rf pkg/symlink/testdata
+install -d -p %{buildroot}/%{gosrc}
 
-# remove dirs that won't be installed in devel
-rm -rf vendor docs _build bundles contrib/init hack project
-
-# install sources to devel
-for dir in */ ; do
-    cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
+for dir in api daemon \
+           image opts pkg registry runconfig
+do
+	cp -rpav $dir %{buildroot}/%{gosrc}
 done
 
+
+install -d %{buildroot}%{_presetdir}
+cat > %{buildroot}%{_presetdir}/86-docker.preset << EOF
+enable docker.socket
+EOF
+
+find %{buildroot} -name "*~" -exec rm -rf {} \;
+find %{buildroot}%{go_dir}/src/pkg/github.com/ -type d -exec chmod 0755 {} \;
+
 %check
 
 %pre
@@ -341,41 +335,52 @@ exit 0
 %files
 %doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md 
 %doc LICENSE-vim-syntax README-vim-syntax.md
-%config(noreplace) %{_sysconfdir}/sysconfig/%{repo}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{repo}-network
-%config(noreplace) %{_sysconfdir}/sysconfig/%{repo}-storage
+# %config(noreplace) %{_sysconfdir}/sysconfig/%{repo}
+# %config(noreplace) %{_sysconfdir}/sysconfig/%{repo}-network
+# %config(noreplace) %{_sysconfdir}/sysconfig/%{repo}-storage
 %{_mandir}/man1/*.1*
 %{_mandir}/man5/*.5*
 %{_mandir}/man8/*.8*
 %{_bindir}/docker
-%dir %{_var}/cache/docker
+%{_bindir}/docker-proxy
+%{_bindir}/dockerd
+# %config(noreplace) %{_sysconfdir}/sysconfig/docker
+%{_presetdir}/86-docker.preset
 %{_unitdir}/docker.service
 %{_unitdir}/docker.socket
 %dir %{_sysconfdir}/bash_completion.d
 %{_sysconfdir}/bash_completion.d/docker.bash
+# %{_datadir}/zsh/site-functions/_docker
 %dir %{_sharedstatedir}/docker
+
 %dir %{_udevrulesdir}
 %{_udevrulesdir}/80-docker.rules
 
-%files devel
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%{gopath}/src/%{import_path}
-
-%files unit-test
-%{_sharedstatedir}/docker-unit-test/
+# %files unit-test
+# %{_sharedstatedir}/docker-unit-test/
 
 %files fish-completion
 %dir %{_datadir}/fish/vendor_completions.d/
 %{_datadir}/fish/vendor_completions.d/%{repo}.fish
 
-%files logrotate
-%doc README.%{repo}-logrotate
-%{_sysconfdir}/cron.daily/%{repo}-logrotate
+# %files logrotate
+# %doc README.%{repo}-logrotate
+# %{_sysconfdir}/cron.daily/%{repo}-logrotate
 
 %files vim
-%{_datadir}/vim/vimfiles/doc/%{repo}file.txt
-%{_datadir}/vim/vimfiles/ftdetect/%{repo}file.vim
-%{_datadir}/vim/vimfiles/syntax/%{repo}file.vim
+%doc LICENSE-vim-syntax README-vim-syntax.md
+%dir %{_datadir}/vim/vimfiles/doc
+%{_datadir}/vim/vimfiles/doc/dockerfile.txt
+%dir %{_datadir}/vim/vimfiles/ftdetect
+%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim
+%dir %{_datadir}/vim/vimfiles/syntax
+%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
 
 %files zsh-completion
 %{_datadir}/zsh/site-functions/_%{repo}
+
+%files devel
+%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md
+%dir %{go_dir}/src/pkg/%{provider}.%{provider_tld}/%{project}
+%{go_dir}/src/pkg/%{import_path}
+