diff --git a/manifests/kafka/broker.pp b/manifests/kafka/broker.pp
index 4cc98a85..290bb9e8 100644
--- a/manifests/kafka/broker.pp
+++ b/manifests/kafka/broker.pp
@@ -1,29 +1,29 @@
 # Kafka broker profile
 
 class profile::kafka::broker {
   include ::profile::zookeeper
 
   class {'::kafka':
     mirror_url    => lookup('kafka::mirror_url'),
     version       => lookup('kafka::version'),
     scala_version => lookup('kafka::scala_version'),
   }
 
   $base_kafka_config = lookup('kafka::broker_config', Hash)
 
   $zookeeper_chroot = lookup('kafka::zookeeper::chroot')
   $zookeeper_servers = lookup('zookeeper::servers', Hash)
-  $zookeeper_port = lookup('zookeeper::election_port', Integer)
+  $zookeeper_port = lookup('zookeeper::client_port', Integer)
   $zookeeper_connect_string = join(
     $zookeeper_servers.map |$id, $server| {"${server}:${zookeeper_port}${zookeeper_chroot}"},
     ','
   )
 
   $kafka_config = $base_kafka_config + {
     'zookeeper.connect' => $zookeeper_connect_string,
   }
 
   class {'::kafka::broker':
     config => $kafka_config,
   }
 }
diff --git a/manifests/zookeeper.pp b/manifests/zookeeper.pp
index aebfa38c..7591f997 100644
--- a/manifests/zookeeper.pp
+++ b/manifests/zookeeper.pp
@@ -1,10 +1,11 @@
 # Zookeeper cluster member profile
 
 class profile::zookeeper {
   class {'::zookeeper':
     servers       => lookup('zookeeper::servers', Hash),
     datastore     => lookup('zookeeper::datastore'),
+    client_port   => lookup('zookeeper::client_port'),
     election_port => lookup('zookeeper::election_port'),
-    leader_port   => lookup('zookeeper::election_port'),
+    leader_port   => lookup('zookeeper::leader_port'),
   }
 }