diff --git a/etcd.service b/etcd.service
index 3d9ab4c..263bc2d 100644
--- a/etcd.service
+++ b/etcd.service
@@ -7,7 +7,8 @@ Type=simple
 WorkingDirectory=/var/lib/etcd/
 EnvironmentFile=-/etc/etcd/etcd.conf
 User=etcd
-ExecStart=/usr/bin/etcd
+# set GOMAXPROCS to number of processors
+ExecStart=/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd"
 Restart=on-failure
 LimitNOFILE=65536
 
diff --git a/etcd.spec b/etcd.spec
index dc6f4d1..be203b5 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -27,7 +27,7 @@
 
 Name:		%{repo}
 Version:	2.0.13
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A highly-available key value store for shared configuration
 License:	ASL 2.0
 URL:		https://%{import_path}
@@ -262,6 +262,9 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
 %endif
 
 %changelog
+* Fri Jul 10 2015 jchaloup <jchaloup@redhat.com> - 2.0.13-3
+- set GOMAXPROCS to use all processors available
+
 * Mon Jun 29 2015 jchaloup <jchaloup@redhat.com> - 2.0.13-2
 - Remove -s option from -ldflags string as it removes symbol table
   'go tool l6' gives explanation of all available options