diff --git a/concourse/scripts/compile_gpdb.bash b/concourse/scripts/compile_gpdb.bash
index 1d0ffb3d6aabdab0cf8434d8af998f868b49ca60..33378d2a3f6b19d50fb933333d6f20ee0e8b8558 100755
--- a/concourse/scripts/compile_gpdb.bash
+++ b/concourse/scripts/compile_gpdb.bash
@@ -74,15 +74,6 @@ function build_gpdb() {
   popd
 }
 
-function build_quicklz() {
-  pushd gpaddon_src/quicklz
-    # Need to have pg_config available to compile and install quicklz.
-    source ${GREENPLUM_INSTALL_DIR}/greenplum_path.sh
-    export PATH=${GREENPLUM_INSTALL_DIR}/bin:$PATH
-    make install
-  popd
-}
-
 function build_gppkg() {
   pushd ${GPDB_SRC_PATH}/gpAux
     make gppkg BLD_TARGETS="gppkg" INSTLOC="${GREENPLUM_INSTALL_DIR}" GPPKGINSTLOC="${GPDB_ARTIFACTS_DIR}" RELENGTOOLS=/opt/releng/tools
@@ -204,10 +195,6 @@ function _main() {
   rsync -au gpaddon_src/ ${GPDB_SRC_PATH}/gpAux/${ADDON_DIR}
 
   build_gpdb "${BLD_TARGET_OPTION[@]}"
-  if [ "${TARGET_OS}" != "win32" ] ; then
-      # Do not build quicklz support for windows
-      build_quicklz
-  fi
   git_info
   build_gppkg
   if [ "${TARGET_OS}" != "win32" ] ; then
diff --git a/gpAux/Makefile b/gpAux/Makefile
index 1778921eb49704ff816d498b5182ba6f9888d5c6..5e256d7033eca8556b05df292e7546b3b445d4cf 100644
--- a/gpAux/Makefile
+++ b/gpAux/Makefile
@@ -162,8 +162,8 @@ APU_CONFIG=--with-apu-config=$(BLD_THIRDPARTY_BIN_DIR)/apu-1-config
 aix7_ppc_64_CONFIGFLAGS=--disable-gpcloud --without-readline --without-libcurl --disable-orca --disable-pxf --without-zstd $(APR_CONFIG)
 win32_CONFIGFLAGS=--with-gssapi --without-libcurl --disable-orca --disable-pxf --disable-gpcloud --without-libbz2 $(APR_CONFIG)
 sol10_x86_64_CONFIGFLAGS= --with-libxml $(APR_CONFIG)
-rhel6_x86_64_CONFIGFLAGS=--enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
-rhel7_x86_64_CONFIGFLAGS=--enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
+rhel6_x86_64_CONFIGFLAGS=--with-quicklz --enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
+rhel7_x86_64_CONFIGFLAGS=--with-quicklz --enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
 #suse10_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
 #suse11_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
 #sles11_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)