diff --git a/defaults/main.yml b/defaults/main.yml
index ca0e3efbb14d055ade019a86e61e2336d78c45e6..91bd9e8a5d02d99b604a95bae92c8e7f0ae9cf1a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -27,12 +27,10 @@ php_packages:
   - php5-mysql
   - php5-xdebug
   - php5-xmlrpc
-  - imagemagick
 
 php_base_dir: php5
 php_conf_dir: conf.d
 
-php_imagick_config_dir: /etc/ImageMagick-6
 php_allow_call_time_pass_reference: 'on'
 php_browscap: no
 php_date_timezone: Europe/Berlin
diff --git a/meta/main.yml b/meta/main.yml
index b974baf26019a91dfb115def20f2685e838c6979..dda8b4b6445bc2be74511766545055e64a7e8b0f 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -2,3 +2,4 @@
 
 dependencies:
   - { role: apache }
+  - { role: imagemagick }
diff --git a/tasks/php.yml b/tasks/php.yml
index b711a31567163bb50ab512502b9e24cde4f2fe0f..a5abd04de2fe731c004632f7196807d2fa9be0c2 100644
--- a/tasks/php.yml
+++ b/tasks/php.yml
@@ -119,22 +119,6 @@
   import_tasks: msodbc.yml
   when: php_needs_msodbc
 
-- name: Ensure ImageMagick config directory
-  file:
-    dest: '{{ php_imagick_config_dir }}'
-    state: directory
-    owner: root
-    group: root
-    mode: 0755
-
-- name: ImageMagick Policy File
-  template:
-    src: etc-imagemagick-policy.xml
-    dest: '{{ php_imagick_config_dir }}/policy.xml'
-    owner: root
-    group: root
-    mode: 0644
-
 - block:
 
     - name: Apache FPM Socket Configuration
diff --git a/templates/etc-imagemagick-policy.xml b/templates/etc-imagemagick-policy.xml
deleted file mode 100644
index 032a556f0fc5f2d0f2b976ef1b4de11ec7113249..0000000000000000000000000000000000000000
--- a/templates/etc-imagemagick-policy.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policymap [
-<!ELEMENT policymap (policy)+>
-<!ELEMENT policy (#PCDATA)>
-<!ATTLIST policy domain (delegate|cache|coder|filter|path|resource) #IMPLIED>
-<!ATTLIST policy name CDATA #IMPLIED>
-<!ATTLIST policy rights CDATA #IMPLIED>
-<!ATTLIST policy pattern CDATA #IMPLIED>
-<!ATTLIST policy value CDATA #IMPLIED>
-]>
-<!--
-  Configure ImageMagick policies.
-
-  Domains include system, delegate, coder, filter, path, or resource.
-
-  Rights include none, read, write, and execute.  Use | to combine them,
-  for example: "read | write" to permit read from, or write to, a path.
-
-  Use a glob expression as a pattern.
-
-  Suppose we do not want users to process MPEG video images:
-
-    <policy domain="delegate" rights="none" pattern="mpeg:decode" />
-
-  Here we do not want users reading images from HTTP:
-
-    <policy domain="coder" rights="none" pattern="HTTP" />
-
-  Lets prevent users from executing any image filters:
-
-    <policy domain="filter" rights="none" pattern="*" />
-
-  The /repository file system is restricted to read only.  We use a glob
-  expression to match all paths that start with /repository:
-
-    <policy domain="path" rights="read" pattern="/repository/*" />
-
-  Any large image is cached to disk rather than memory:
-
-    <policy domain="resource" name="area" value="1GB"/>
-
-  Define arguments for the memory, map, area, and disk resources with
-  SI prefixes (.e.g 100MB).  In addition, resource policies are maximums for
-  each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
-  exceeds policy maximum so memory limit is 1GB).
--->
-<policymap>
-  <!-- <policy domain="system" name="precision" value="6"/> -->
-  <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
-  <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
-  <!-- <policy domain="resource" name="map" value="4GiB"/> -->
-  <!-- <policy domain="resource" name="area" value="1GB"/> -->
-  <!-- <policy domain="resource" name="disk" value="16EB"/> -->
-  <!-- <policy domain="resource" name="file" value="768"/> -->
-  <!-- <policy domain="resource" name="thread" value="4"/> -->
-  <!-- <policy domain="resource" name="throttle" value="0"/> -->
-  <policy domain="resource" name="time" value="30"/>
-  <policy domain="cache" name="shared-secret" value="passphrase"/>
-  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
-  <policy domain="coder" rights="none" pattern="URL" />
-  <policy domain="coder" rights="none" pattern="HTTPS" />
-  <policy domain="coder" rights="none" pattern="MVG" />
-  <policy domain="coder" rights="none" pattern="MSL" />
-  <policy domain="coder" rights="none" pattern="TEXT" />
-  <policy domain="coder" rights="none" pattern="SHOW" />
-  <policy domain="coder" rights="none" pattern="WIN" />
-  <policy domain="coder" rights="none" pattern="PLT" />
-  <policy domain="path" rights="none" pattern="@*" />
-  <!-- disable ghostscript format types -->
-  <policy domain="coder" rights="none" pattern="PS" />
-  <policy domain="coder" rights="none" pattern="EPS" />
-  <policy domain="coder" rights="read | write" pattern="PDF" />
-  <policy domain="coder" rights="none" pattern="XPS" />
-</policymap>