diff --git a/flink-connectors/flink-connector-kafka-0.10/pom.xml b/flink-connectors/flink-connector-kafka-0.10/pom.xml
index ab60946b9e7588d1e4f73f758bc1b8bfa8d6a00e..9fb0e613bc18bb8044a50d54701f94e833a3dc4f 100644
--- a/flink-connectors/flink-connector-kafka-0.10/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.10/pom.xml
@@ -56,6 +56,15 @@ under the License.
 			</exclusions>
 		</dependency>
 
+		<!-- streaming-java dependencies -->
+
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-streaming-java_2.10</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- Add Kafka 0.10.x as a dependency -->
 
 		<dependency>
diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml
index 00c08ef9f2beb85ad2e3293a9b9fb2fc3d7c8978..4fc05568d3fe6d47880158d849de475cba59538e 100644
--- a/flink-connectors/flink-hbase/pom.xml
+++ b/flink-connectors/flink-hbase/pom.xml
@@ -76,6 +76,8 @@ under the License.
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- flink-java dependencies -->
+
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-java</artifactId>
@@ -83,6 +85,25 @@ under the License.
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- flink-scala dependencies -->
+
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-scala_2.10</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- streaming-scala dependencies -->
+
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-streaming-scala_2.10</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- table dependencies -->
 
 		<dependency>
 			<groupId>org.apache.flink</groupId>
@@ -93,6 +114,7 @@ under the License.
 			won't depend on flink-table. -->
 			<optional>true</optional>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 76df09e4f17696a9244d0a187d203740ea29d7ac..a700870624d41fa9f81d9655b361022f876c7141 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -239,6 +239,13 @@ under the License.
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-table_2.10</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<!-- end optional Flink libraries -->
 	</dependencies>
 
diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index 3622ece29d3488ec32548bad530a31e9e3486b71..0282315fc9854a485ea3487b84282406d791bc82 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -59,6 +59,14 @@
 			<fileMode>0644</fileMode>
 		</file>
 
+		<!-- TableAPI-->
+		<file>
+			<source>../flink-libraries/flink-table/target/flink-table_2.10-${project.version}.jar</source>
+			<outputDirectory>opt/</outputDirectory>
+			<destName>flink-table_2.10-${project.version}.jar</destName>
+			<fileMode>0644</fileMode>
+		</file>
+
 		<!-- ML -->
 		<file>
 			<source>../flink-libraries/flink-ml/target/flink-ml_2.10-${project.version}-jar-with-dependencies.jar</source>
diff --git a/flink-examples/flink-examples-table/pom.xml b/flink-examples/flink-examples-table/pom.xml
index de050d742b004bab43f72603544fabf26a8f605b..684d883f3d599b42ef2bb2f8e16348f16b746063 100644
--- a/flink-examples/flink-examples-table/pom.xml
+++ b/flink-examples/flink-examples-table/pom.xml
@@ -34,10 +34,19 @@ under the License.
 	<packaging>jar</packaging>
 
 	<dependencies>
+
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-table_2.10</artifactId>
 			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-streaming-scala_2.10</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml
index 49eb45165c7a957c659874701766049547aaad6f..c7440ab456786cebe048473af259af8c17e13463 100644
--- a/flink-libraries/flink-table/pom.xml
+++ b/flink-libraries/flink-table/pom.xml
@@ -40,6 +40,7 @@ under the License.
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-streaming-scala_2.10</artifactId>
 			<version>${project.version}</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -195,13 +196,17 @@ under the License.
 						<configuration>
 							<filters>
 								<filter>
+									<artifact>*:*</artifact>
 									<excludes>
-									    	<exclude>org-apache-calcite-jdbc.properties</exclude>
+										<exclude>org-apache-calcite-jdbc.properties</exclude>
 										<exclude>mozilla/**</exclude>
 										<exclude>codegen/**</exclude>
 										<exclude>google/**</exclude>
+										<exclude>META-INF/*.SF</exclude>
+										<exclude>META-INF/*.DSA</exclude>
+										<exclude>META-INF/*.RSA</exclude>
 									</excludes>
-								 </filter>
+								</filter>
 							</filters>
 							<artifactSet>
 								<includes combine.children="append">
@@ -209,6 +214,7 @@ under the License.
 									<include>org.apache.calcite.avatica:*</include>
 									<include>net.hydromatic:*</include>
                                     <include>org.reflections:*</include>
+									<include>org.codehaus.janino:*</include>
                                 </includes>
 							</artifactSet>
 							<relocations>