diff --git a/bigtop-packages/src/common/kafka/do-component-build b/bigtop-packages/src/common/kafka/do-component-build
index a67d46b..a48b9e3 100644
--- a/bigtop-packages/src/common/kafka/do-component-build
+++ b/bigtop-packages/src/common/kafka/do-component-build
@@ -29,6 +29,9 @@
 
 gradle wrapper
 
+# Rewrite the zookeeper version defined in gradle/dependencies.gradle directly
+# with $ZOOKEEPER_VERSION, because we can't override it via command line option.
+sed -i -e 's/zookeeper: *"\([0-9]\{1,\}\.\)*[0-9]\{1,\}"/zookeeper: "'${ZOOKEEPER_VERSION}'"/' gradle/dependencies.gradle
 ./gradlew -PscalaVersion=${SCALA_VERSION} clean releaseTarGz -x signArchives
 
 rm -rf build
diff --git a/bigtop.bom b/bigtop.bom
index 5b2a761..760452b 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -114,10 +114,10 @@
     'bigtop-groovy':['hadoop'],
     'bigtop-jsvc':['hadoop'],
     'bigtop-tomcat':['oozie', 'sqoop2'],
-    zookeeper:['hadoop', 'hbase'],
+    zookeeper:['hadoop', 'hbase', 'kafka'],
     hadoop:['ignite-hadoop', 'hbase', 'hive', 'tez', 'sqoop', 'sqoop2',
       'oozie', 'mahout', 'flume', 'giraph', 'solr', 'spark',
-      'phoenix', 'alluxio', 'kafka', 'ycsb', 'zeppelin'
+      'phoenix', 'alluxio', 'ycsb', 'zeppelin'
     ],
     hbase:['phoenix','giraph','ycsb','hive'],
     hive:['oozie', 'zeppelin'],
@@ -361,7 +361,7 @@
     'kafka' {
       name    = 'kafka'
       relNotes = 'Apache Kafka'
-      version { base = '2.4.0'; pkg = base; release = 1 }
+      version { base = '2.4.1'; pkg = base; release = 1 }
       tarball { destination = "$name-${version.base}.tar.gz"
                 source      = "$name-${version.base}-src.tgz" }
       url     { download_path = "/$name/${version.base}/"