diff --git a/conf/uno.conf b/conf/uno.conf
index 58c3307..dcb90c4 100644
--- a/conf/uno.conf
+++ b/conf/uno.conf
@@ -32,10 +32,12 @@
 # Tarball file names
 export ACCUMULO_TARBALL=accumulo-$ACCUMULO_VERSION-bin.tar.gz
 export HADOOP_TARBALL=hadoop-"$HADOOP_VERSION".tar.gz
-export ZOOKEEPER_TARBALL=apache-zookeeper-"$ZOOKEEPER_VERSION"-bin.tar.gz
 export FLUO_TARBALL=fluo-$FLUO_VERSION-bin.tar.gz
 export FLUO_YARN_TARBALL=fluo-yarn-$FLUO_YARN_VERSION-bin.tar.gz
-
+export ZOOKEEPER_TARBALL=apache-zookeeper-"$ZOOKEEPER_VERSION"-bin.tar.gz
+if [[ $ZOOKEEPER_VERSION =~ ^3[.][01234].*$ ]]; then
+    export ZOOKEEPER_TARBALL=zookeeper-"$ZOOKEEPER_VERSION".tar.gz
+fi
 # Building Accumulo
 #------------------
 # If set, 'uno fetch' will build (instead of downloading) an Accumulo tarball
@@ -118,6 +120,9 @@
 export DATA_DIR=$INSTALL/data
 # Home directories
 export ZOOKEEPER_HOME=$INSTALL/apache-zookeeper-$ZOOKEEPER_VERSION-bin
+if [[ $ZOOKEEPER_VERSION =~ ^3[.][01234].*$ ]]; then
+  export ZOOKEEPER_HOME=$INSTALL/zookeeper-$ZOOKEEPER_VERSION
+fi
 export HADOOP_HOME=$INSTALL/hadoop-$HADOOP_VERSION
 export ACCUMULO_HOME=$INSTALL/accumulo-$ACCUMULO_VERSION
 export FLUO_HOME=$INSTALL/fluo-$FLUO_VERSION