diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml
index 217c623db8..e583bd9c90 100644
--- a/playbooks/groups/people.yml
+++ b/playbooks/groups/people.yml
@@ -74,8 +74,6 @@
 
   - role: apache
 
-  - role: httpd/mod_ssl
-
   - role: httpd/certificate
     name: wildcard-2014.fedorapeople.org
     SSLCertificateChainFile: wildcard-2014.fedorapeople.org.intermediate.cert
diff --git a/roles/people/tasks/main.yml b/roles/people/tasks/main.yml
index a5627e988f..ae0a92610d 100644
--- a/roles/people/tasks/main.yml
+++ b/roles/people/tasks/main.yml
@@ -16,6 +16,7 @@
   - libxml2-python
   - python-jinja2
   - tree            # requested in ticket 5148
+  - mod_ssl
   tags:
   - packages
   - people
@@ -34,6 +35,19 @@
   tags:
   - people
 
+- name: Install haveged for entropy
+  yum: name=haveged state=installed
+  tags:
+  - httpd
+  - httpd/proxy
+
+- name: Set haveged running/enabled
+  service: name=haveged enabled=yes state=started
+  tags:
+  - service
+  - httpd
+  - httpd/proxy
+
 - name: Empty default welcome.conf
   copy: dest=/etc/httpd/conf.d/welcome.conf content=""
   tags: