diff --git a/drupal-org/defaults/main.yml b/drupal-org/defaults/main.yml
index 2f55a597..80c76b5d 100644
--- a/drupal-org/defaults/main.yml
+++ b/drupal-org/defaults/main.yml
@@ -8,6 +8,8 @@ drupal_tar_url: 'http://ftp.drupal.org/files/projects/{{ drupal_dist_file }}'
 drupal_php_user: drupal
 drupal_download_dir: /srv/drupal
 drupal_install_dir: /var/www
+http_user: www-data
+http_group: '{{ http_user }}'
 
 # If you use the PHP ppa to install php 5.6, also install those packages:
 #
diff --git a/drupal-org/tasks/drupal-main.yml b/drupal-org/tasks/drupal-main.yml
index 2c6a093c..6fede237 100644
--- a/drupal-org/tasks/drupal-main.yml
+++ b/drupal-org/tasks/drupal-main.yml
@@ -68,6 +68,12 @@
   when: ( unpack_drupal | changed )
   tags: drupal
 
+- name: Set the correct ownership of the drupal modules directory
+  file: dest={{ drupal_install_dir }}/{{ item.virthost }}/modules owner={{ item.user }} group={{ http_group }} recurse=yes state=directory mode=0775
+  with_items: '{{ phpfpm_pools }}'
+  when: ( unpack_drupal | changed )
+  tags: drupal
+
 - name: Remove the original drupal unpacked distribution
   file: dest={{ drupal_download_dir }}/{{ drupal_dist_name }} state=absent
   when: ( unpack_drupal | changed )