diff --git a/build_debian.sh b/build_debian.sh
index 28b9833612b1..fea55144cfa0 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -227,8 +227,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     hping3                  \
     python-scapy            \
     tcptraceroute           \
-    mtr-tiny                \
-    picocom
+    mtr-tiny
 
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
     grub-pc-bin
@@ -238,6 +237,9 @@ sudo mv $FILESYSTEM_ROOT/grub-pc-bin*.deb $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-
 sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/libwrap0_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 
+sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/picocom_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+
 ## Disable kexec supported reboot which was installed by default
 sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
 
diff --git a/rules/picocom.mk b/rules/picocom.mk
new file mode 100644
index 000000000000..a45ac9ecbbe6
--- /dev/null
+++ b/rules/picocom.mk
@@ -0,0 +1,11 @@
+# picocom packages
+
+PICOCOM_VERSION = 3.1-2
+
+export PICOCOM_VERSION
+
+PICOCOM = picocom_$(PICOCOM_VERSION)_amd64.deb
+$(PICOCOM)_SRC_PATH = $(SRC_PATH)/picocom
+SONIC_MAKE_DEBS += $(PICOCOM)
+
+SONIC_STRETCH_DEBS += $(PICOCOM)
diff --git a/slave.mk b/slave.mk
index 4f1998680b29..a16a0cb488c1 100644
--- a/slave.mk
+++ b/slave.mk
@@ -462,7 +462,8 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
                 $(BASH) \
                 $(LIBWRAP) \
                 $(LIBPAM_TACPLUS) \
-                $(LIBNSS_TACPLUS)) \
+                $(LIBNSS_TACPLUS) \
+                $(PICOCOM)) \
         $$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \
         $$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE)) \
         $$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2))
diff --git a/sonic-slave-stretch/Dockerfile b/sonic-slave-stretch/Dockerfile
index 4f7582efa0b4..79f86bd7e255 100644
--- a/sonic-slave-stretch/Dockerfile
+++ b/sonic-slave-stretch/Dockerfile
@@ -201,7 +201,9 @@ RUN apt-get update && apt-get install -y \
 # For pam_tacplus build
         autoconf-archive \
 # For initramfs
-        bash-completion
+        bash-completion \
+# For picocom
+        pandoc
 
 # For linux build
 RUN apt-get -y build-dep linux
diff --git a/src/picocom/Makefile b/src/picocom/Makefile
new file mode 100644
index 000000000000..46b6034da9fa
--- /dev/null
+++ b/src/picocom/Makefile
@@ -0,0 +1,28 @@
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+MAIN_TARGET = picocom_$(PICOCOM_VERSION)_amd64.deb
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	# Remove any stale files
+	rm -rf ./picocom-3.1
+
+	# Get source package
+	wget -NO picocom_$(PICOCOM_VERSION).dsc "https://sonicstorage.blob.core.windows.net/packages/debian/picocom_3.1-2.dsc?sv=2015-04-05&sr=b&sig=puo9KA27jT9Ey%2FkxRPBLIm30gFDdQJF85VKA7vuv9hk%3D&se=2155-07-10T08%3A03%3A50Z&sp=r"
+	wget -NO picocom_$(PICOCOM_VERSION).debian.tar.xz "https://sonicstorage.blob.core.windows.net/packages/debian/picocom_3.1-2.debian.tar.xz?sv=2015-04-05&sr=b&sig=4HPuUi2FTb0AzCEsH9%2FsSfj17qIukyyOdRrHQFtjyBE%3D&se=2155-07-10T08%3A04%3A23Z&sp=r"
+	wget -NO picocom_3.1.orig.tar.gz "https://sonicstorage.blob.core.windows.net/packages/debian/picocom_3.1.orig.tar.gz?sv=2015-04-05&sr=b&sig=RjQ84sf%2B%2FQuI%2B0PAcbPHXvnlNAuP%2BQoVrp2xzDJZfX4%3D&se=2155-07-10T08%3A04%3A45Z&sp=r"
+
+	dpkg-source -x picocom_$(PICOCOM_VERSION).dsc
+
+	# Build source and Debian packages
+	pushd picocom-3.1
+	patch -p0 < ../debhelper_10.patch
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	popd
+
+	# Move the newly-built .deb packages to the destination directory
+	mv $(DERIVED_TARGETS) $* $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
+
diff --git a/src/picocom/debhelper_10.patch b/src/picocom/debhelper_10.patch
new file mode 100644
index 000000000000..6c0ff47a553e
--- /dev/null
+++ b/src/picocom/debhelper_10.patch
@@ -0,0 +1,11 @@
+--- debian/control.old	2018-08-17 08:05:35.996230100 +0000
++++ debian/control	2018-08-17 08:05:43.712230100 +0000
+@@ -3,7 +3,7 @@
+ Priority: optional
+ Maintainer: Matt Palmer <mpalmer@debian.org>
+ Uploaders: W. Martin Borgert <debacle@debian.org>
+-Build-Depends: debhelper (>= 11),
++Build-Depends: debhelper (>= 10),
+ 	pandoc
+ Standards-Version: 4.1.3
+ Rules-Requires-Root: no