diff --git a/Makefile.am b/Makefile.am
index 6661ff163..f4479c1bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = meta lib vslib proxylib pyext
 
 if SYNCD
-SUBDIRS += syncd saiplayer saidump saidiscovery saisdkdump saiasiccmp tests unittest
+SUBDIRS += syncd saiplayer saidump rdb saidiscovery saisdkdump saiasiccmp tests unittest
 endif
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 5cddce073..a019dd7ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -286,6 +286,7 @@ AC_OUTPUT(Makefile
           syncd/tests/Makefile
           saiplayer/Makefile
           saidump/Makefile
+          rdb/Makefile
           saisdkdump/Makefile
           saidiscovery/Makefile
           saiasiccmp/Makefile
diff --git a/debian/syncd.install b/debian/syncd.install
index c559f1fea..911cc4d18 100644
--- a/debian/syncd.install
+++ b/debian/syncd.install
@@ -1,4 +1,5 @@
 usr/bin/saidump
+usr/bin/rdb-cli
 usr/bin/saiplayer
 usr/bin/saisdkdump
 usr/bin/saidiscovery
diff --git a/rdb/Makefile.am b/rdb/Makefile.am
new file mode 100755
index 000000000..b84d929fe
--- /dev/null
+++ b/rdb/Makefile.am
@@ -0,0 +1,24 @@
+AM_CXXFLAGS = -Wno-error=format
+bin_PROGRAMS = rdb-cli$(EXEEXT)
+rdb_cli_SOURCES =
+
+clone-repo:
+	echo "Cloning repository..."; \
+	rm -rf librdb; \
+	git clone https://github.com/redis/librdb.git; \
+	cd librdb; \
+	git checkout b401df1e7025501c24f0c852aa32f6900fd888f7; \
+	cd ..
+
+update-submodules-and-build: clone-repo
+	cd librdb && git submodule update --init --recursive && $(MAKE)
+	cp ./librdb/bin/rdb-cli ./
+	rm -rf ./librdb
+
+rdb-cli$(EXEEXT): update-submodules-and-build
+
+clean-local:
+	rm -rf ./librdb
+
+install:
+	cp rdb-cli $(DESTDIR)/usr/bin/
\ No newline at end of file