diff --git a/docker.spec b/docker.spec
index a4a5a99..a741998 100644
--- a/docker.spec
+++ b/docker.spec
@@ -91,7 +91,7 @@ Name: %{repo}
 Epoch: 2
 %endif
 Version: 1.13.1
-Release: 34.git%{shortcommit_docker}%{?dist}
+Release: 35.git%{shortcommit_docker}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo}
@@ -776,8 +776,8 @@ for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
 done
 %endif
 
-# install %%{repo} config directory
-install -dp %{buildroot}%{_sysconfdir}/%{repo}
+# install %%{name} config directory
+install -dp %{buildroot}%{_sysconfdir}/%{name}
 
 # install d-s-s
 pushd container-storage-setup-%{commit_dss}
@@ -981,6 +981,7 @@ exit 0
 %doc README-%{repo}-common
 %{_bindir}/%{repo}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{repo}
+%{_sysconfdir}/%{name}/seccomp.json
 
 %files vim
 %{_datadir}/vim/vimfiles/doc/%{repo}file.txt
@@ -1011,6 +1012,9 @@ exit 0
 %{_unitdir}/%{repo}-lvm-plugin.*
 
 %changelog
+* Thu Oct 19 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-35.git8fd0ebb
+- Resolves: #1504065 - include seccomp.json in docker-common
+
 * Wed Oct 18 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-34.git8fd0ebb
 - built docker @projectatomic/docker-1.13.1 commit 8fd0ebb
 - built docker-novolume-plugin commit 385ec70
diff --git a/seccomp.json b/seccomp.json
index 8c634ce..e89ab2a 100644
--- a/seccomp.json
+++ b/seccomp.json
@@ -698,4 +698,8 @@
 			"excludes": {}
 		}
 	]
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> 8c0a435... docker-2:1.13.1-35.git8fd0ebb