diff --git a/docs/interpreter/geode.md b/docs/interpreter/geode.md
index 53a912e3ac6..288011202c4 100644
--- a/docs/interpreter/geode.md
+++ b/docs/interpreter/geode.md
@@ -6,6 +6,16 @@ group: manual
 ---
 {% include JB/setup %}
 
+> **Note**: The Geode jar dependencies are compiled with `JDK8` ([ZEPPELIN-375](https://issues.apache.org/jira/browse/ZEPPELIN-375) and [GEODE-479](https://issues.apache.org/jira/browse/GEODE-479)). The Geode module is `disabled for JDK7` environments. It is `automatically enabled for JDK8+` environment. Geode will be enabled event if the java source/target parameters are set to 1.7 as long as the compiler is JDK8+. You can enable the Geode module manually by activating the `geode` profile:
+```
+mvn clean package -Pgeode -Pbuild-distr
+```
+
+> Also you can use the `maven.compiler.source` and `maven.compiler.source` properties to override the default (1.7) source/target java compilation settings:
+```
+mvn .... -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
+```
+
 ## Geode/Gemfire OQL Interpreter for Apache Zeppelin
 <table class="table-configuration">
   <tr>
@@ -33,6 +43,7 @@ This interpreter supports the [Geode](http://geode.incubator.apache.org/) [Objec
 
 This [Video Tutorial](https://www.youtube.com/watch?v=zvzzA9GXu3Q) illustrates some of the features provided by the `Geode Interpreter`.
 
+
 ### Create Interpreter
 By default Zeppelin creates one `Geode/OQL` instance. You can remove it or create more instances.
 
diff --git a/pom.xml b/pom.xml
index 2e75d2ad47a..298b4fac602 100755
--- a/pom.xml
+++ b/pom.xml
@@ -635,6 +635,9 @@
     <!-- Geode can be enabled by -Pgeode. see https://issues.apache.org/jira/browse/ZEPPELIN-375 -->
     <profile>
       <id>geode</id>
+      <activation>
+        <jdk>[1.8,1.9]</jdk>
+      </activation>      
       <modules>
         <module>geode</module>
       </modules>
diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml
index df448983ec0..0c875b0cd83 100644
--- a/zeppelin-distribution/pom.xml
+++ b/zeppelin-distribution/pom.xml
@@ -95,6 +95,35 @@
   </build>
 
   <profiles>
+    <!-- Enable the Geode binary generation. Activated automatically if Java8 is used or the -Pgeode profile is set.
+    See https://issues.apache.org/jira/browse/ZEPPELIN-375 -->
+    <profile>
+      <id>geode</id>
+      <activation>
+        <jdk>[1.8,1.9]</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.zeppelin</groupId>
+          <artifactId>zeppelin-geode</artifactId>
+          <version>${project.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>enforce</id>
+                <phase>none</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>publish-distr</id>
       <activation>