diff --git a/src/rdb-cli/Makefile b/src/rdb-cli/Makefile
index b9aedad6f657..153c2bcfac22 100644
--- a/src/rdb-cli/Makefile
+++ b/src/rdb-cli/Makefile
@@ -8,7 +8,8 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	rm -rf ./librdb
 	git clone https://github.com/redis/librdb.git
 	pushd ./librdb/
-	git checkout 2fdfc0c2bc914d643fe3f86e6715aeb843d8966e
+	git checkout tags/v1.0.0
 	git submodule update --init --recursive	
-	make -j$(SONIC_CONFIG_MAKE_JOBS)
+	# Set WARNS=... to work around https://github.com/redis/librdb/issues/55
+	make -j$(SONIC_CONFIG_MAKE_JOBS) WARNS='-Wall -Wextra -pedantic -flto=auto'
 	mv bin/rdb-cli $(DEST)/