diff --git a/mx.fastr/mx_fastr_dists.py b/mx.fastr/mx_fastr_dists.py
index 2c9edafed058f67786b9b69cd0420e2e37a110b5..835c2cc9deb19f6a85e70051d34ed1788944d202 100644
--- a/mx.fastr/mx_fastr_dists.py
+++ b/mx.fastr/mx_fastr_dists.py
@@ -201,6 +201,8 @@ def mx_post_parse_cmd_line(opts):
     else:
         val = ""
     mx.instantiateDistribution('FASTR_RELEASE<rffi>', dict(rffi=val))
+    if os.environ.has_key('FASTR_RELEASE') and val == '':
+        mx.instantiateDistribution('FASTR_GRAALVM_SUPPORT<rffi>', dict(rffi=val))
 
     for dist in mx_fastr._fastr_suite.dists:
         if isinstance(dist, mx.JARDistribution):
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index d3d1571cabf4e45d91cec7f91d3332c4109c7e85..65b520b2dac736b7117a0027dd1838c90f34f451 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -309,7 +309,7 @@ suite = {
       "sourceDirs" : ["src"],
       "buildDependencies" : ["com.oracle.truffle.r.native.recommended"],
       "class" : "FastRReleaseProject",
-      "output" : "com.oracle.truffle.r.release"
+      "output" : "com.oracle.truffle.r.release",
     },
 
     "com.oracle.truffle.r.native.recommended" : {
@@ -417,8 +417,8 @@ suite = {
     "FASTR_RELEASE<rffi>": {
       "description" : "a binary release of FastR",
       "dependencies" : ["com.oracle.truffle.r.release"],
-       "os_arch" : {
-         "linux" : {
+      "os_arch" : {
+        "linux" : {
           "amd64" : {
             "path" : "mxbuild/dists/linux/amd64/<rffi>/fastr-release.jar",
           },
@@ -441,5 +441,39 @@ suite = {
         },
       },
     },
+
+    "FASTR_GRAALVM_SUPPORT<rffi>" : {
+      "native" : True,
+      "platformDependent" : True,
+      "description" : "FastR support distribution for the GraalVM",
+      "layout" : {
+        "./" : [
+          {
+            "source_type": "extracted-dependency",
+            "dependency": "FASTR_RELEASE<rffi>",
+            "path": "*",
+            "exclude": [
+              "COPYRIGHT",
+              "LICENSE",
+              "README.md",
+              "bin/fastr_jars",
+            ],
+          },
+          {
+            "source_type": "extracted-dependency",
+            "dependency": "FASTR_RELEASE<rffi>",
+            "path": "bin/fastr_jars/*",
+            "exclude" : [
+              "bin/fastr_jars/truffle*",
+              "bin/fastr_jars/graal-sdk*",
+            ],
+          },
+          "dependency:fastr:GNUR",
+        ],
+        "COPYRIGHT_FASTR" : "extracted-dependency:fastr:FASTR_RELEASE<rffi>/COPYRIGHT",
+        "LICENSE_FASTR" : "extracted-dependency:fastr:FASTR_RELEASE<rffi>/LICENSE",
+        "README_FASTR" : "extracted-dependency:fastr:FASTR_RELEASE<rffi>/README.md",
+      },
+    }
   },
 }