diff --git a/var/spack/repos/builtin/packages/claw/ivy_local_cache.patch b/var/spack/repos/builtin/packages/claw/ivy_local_cache.patch
new file mode 100644
index 00000000000..e4cd6f54d80
--- /dev/null
+++ b/var/spack/repos/builtin/packages/claw/ivy_local_cache.patch
@@ -0,0 +1,25 @@
+diff --git a/cx2t/common-targets.xml b/cx2t/common-targets.xml
+index 28ac8be9..a0fcaa6d 100644
+--- a/cx2t/common-targets.xml
++++ b/cx2t/common-targets.xml
+@@ -28,6 +28,7 @@
+         <pathelement location="../lib/ivy.jar"/>
+       </classpath>
+     </taskdef>
++    <ivy:settings file="../ivysettings.xml"/>
+     <ivy:retrieve log="quiet" file="../ivy.xml"
+                   pattern="../lib/[artifact](-[classifier]).[ext]"/>
+   </target>
+diff --git a/cx2t/ivysettings.xml b/cx2t/ivysettings.xml
+new file mode 100644
+index 00000000..2befe6ff
+--- /dev/null
++++ b/cx2t/ivysettings.xml
+@@ -0,0 +1,7 @@
++<ivysettings>
++    <settings defaultResolver="public"/>
++    <caches defaultCacheDir="${ivy.settings.dir}/ivycache"/>
++    <resolvers>
++        <ibiblio name="public" m2compatible="true"/>
++    </resolvers>
++</ivysettings>
diff --git a/var/spack/repos/builtin/packages/claw/package.py b/var/spack/repos/builtin/packages/claw/package.py
index 0c43205a820..19b574f530c 100644
--- a/var/spack/repos/builtin/packages/claw/package.py
+++ b/var/spack/repos/builtin/packages/claw/package.py
@@ -15,6 +15,7 @@ class Claw(CMakePackage):
     git      = 'https://github.com/claw-project/claw-compiler.git'
     maintainers = ['clementval']
 
+    version('master', branch='master', submodules=True)
     version('2.0.2', commit='8c012d58484d8caf79a4fe45597dc74b4367421c', submodules=True)
     version('2.0.1', commit='f5acc929df74ce66a328aa4eda9cc9664f699b91', submodules=True)
     version('2.0',   commit='53e705b8bfce40a5c5636e8194a7622e337cf4f5', submodules=True)
@@ -25,20 +26,31 @@ class Claw(CMakePackage):
     version('1.1.0', commit='16b165a443b11b025a77cad830b1280b8c9bcf01', submodules=True)
 
     depends_on('cmake@3.0:', type='build')
+    depends_on('ant@1.9:', type='build')
+    depends_on('bison', type='build')
+    depends_on('flex', type='build')
+
     depends_on('java@8:', when="@2.0:")
     depends_on('java@7:', when="@1.1.0:1.2.3")
-    depends_on('ant@1.9:')
     depends_on('libxml2')
-    depends_on('bison')
+
+    patch('https://github.com/claw-project/claw-compiler/commit/e9fe6dbd291454ce34dd58f21d102f7f1bdff874.patch',
+          sha256='44a3e17bf6e972db9760fc50bc0948309ee441dab1cdb11816ba675de0138549',
+          when='@:2.0.2%intel')
+
+    # Cache ANT dependencies in the stage directory.
+    # Otherwise, they are cached to the user's home directory.
+    patch('ivy_local_cache.patch')
+
+    # https://github.com/claw-project/claw-compiler/pull/586
+    conflicts('%nag', when='@:2.0.1')
+
+    filter_compiler_wrappers('claw_f.conf', relative_root='etc')
 
     def cmake_args(self):
-        args = []
-        spec = self.spec
-
-        args.append('-DOMNI_CONF_OPTION=--with-libxml2={0}'.
-                    format(spec['libxml2'].prefix))
-
-        args.append('-DCMAKE_Fortran_COMPILER={0}'.
-                    format(self.compiler.fc))
+        args = [
+            '-DOMNI_CONF_OPTION=--with-libxml2=%s' %
+            self.spec['libxml2'].prefix
+        ]
 
         return args