diff --git a/.gitmodules b/.gitmodules
index c8fb78edcd..131b4634b5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -56,3 +56,8 @@
 [submodule "platform/broadcom/sonic-platform-modules-ingrasys-s9100"]
 	path = platform/broadcom/sonic-platform-modules-ingrasys-s9100
 	url = https://github.com/Ingrasys-sonic/sonic-platform-ingrasys-s9100
+[submodule "src/SAI"]
+	path = src/SAI
+	url = https://github.com/opencomputeproject/SAI
+	branch = v0.9.4
+
diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk
new file mode 100644
index 0000000000..c809539b47
--- /dev/null
+++ b/platform/broadcom/libsaithrift-dev.mk
@@ -0,0 +1,7 @@
+# libsaithrift-dev package
+
+LIBSAITHRIFT_DEV_BRCM = libsaithrift-dev_0.9.4_amd64.deb
+$(LIBSAITHRIFT_DEV_BRCM)_SRC_PATH = $(SRC_PATH)/SAI
+$(LIBSAITHRIFT_DEV_BRCM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BRCM_SAI) $(BRCM_SAI_DEV)
+$(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
+SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BRCM)
diff --git a/platform/broadcom/python-saithrift.mk b/platform/broadcom/python-saithrift.mk
new file mode 100644
index 0000000000..f9da4143c7
--- /dev/null
+++ b/platform/broadcom/python-saithrift.mk
@@ -0,0 +1,6 @@
+# python-saithrift package
+
+PYTHON_SAITHRIFT_BRCM = python-saithrift_0.9.4_amd64.deb
+$(PYTHON_SAITHRIFT_BRCM)_SRC_PATH = $(SRC_PATH)/SAI
+$(PYTHON_SAITHRIFT_BRCM)_DEPENDS += $(BRCM_SAI_DEV) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
+SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_BRCM)
diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk
index 79d01b02f7..aaf5f5dc5f 100755
--- a/platform/broadcom/rules.mk
+++ b/platform/broadcom/rules.mk
@@ -9,6 +9,8 @@ include $(PLATFORM_PATH)/docker-syncd-brcm.mk
 include $(PLATFORM_PATH)/docker-syncd-brcm-rpc.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/one-aboot.mk
+include $(PLATFORM_PATH)/libsaithrift-dev.mk
+include $(PLATFORM_PATH)/python-saithrift.mk
 
 BCMCMD = bcmcmd
 $(BCMCMD)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmcmd?sv=2015-04-05&sr=b&sig=X3bFApmsNFmcnWM9mSGRxBugPcg%2FgJCHh5hhSuV1M2c%3D&se=2030-08-23T14%3A41%3A56Z&sp=r"
diff --git a/platform/cavium/libsaithrift-dev.mk b/platform/cavium/libsaithrift-dev.mk
new file mode 100644
index 0000000000..4a19fabffa
--- /dev/null
+++ b/platform/cavium/libsaithrift-dev.mk
@@ -0,0 +1,7 @@
+# libsaithrift-dev package
+
+LIBSAITHRIFT_DEV_CAVM = libsaithrift-dev_0.9.4_amd64.deb
+$(LIBSAITHRIFT_DEV_CAVM)_SRC_PATH = $(SRC_PATH)/SAI
+$(LIBSAITHRIFT_DEV_CAVM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(CAVM_LIBSAI) $(CAVM_SAI)
+$(LIBSAITHRIFT_DEV_CAVM)_RDEPENDS += $(LIBTHRIFT) $(CAVM_SAI)
+SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_CAVM)
diff --git a/platform/cavium/python-saithrift.mk b/platform/cavium/python-saithrift.mk
new file mode 100644
index 0000000000..91d00ebaeb
--- /dev/null
+++ b/platform/cavium/python-saithrift.mk
@@ -0,0 +1,6 @@
+# python-saithrift package
+
+PYTHON_SAITHRIFT_CAVM = python-saithrift_0.9.4_amd64.deb
+$(PYTHON_SAITHRIFT_CAVM)_SRC_PATH = $(SRC_PATH)/SAI
+$(PYTHON_SAITHRIFT_CAVM)_DEPENDS += $(CAVM_LIBSAI) $(CAVM_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
+SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_CAVM)
diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk
index 0531206671..f72989c241 100644
--- a/platform/cavium/rules.mk
+++ b/platform/cavium/rules.mk
@@ -3,6 +3,8 @@ include $(PLATFORM_PATH)/docker-syncd-cavm.mk
 include $(PLATFORM_PATH)/docker-orchagent-cavm.mk
 include $(PLATFORM_PATH)/cavm_platform_modules.mk
 include $(PLATFORM_PATH)/one-image.mk
+include $(PLATFORM_PATH)/libsaithrift-dev.mk
+include $(PLATFORM_PATH)/python-saithrift.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM_GOBGP)
diff --git a/platform/centec/libsaithrift-dev.mk b/platform/centec/libsaithrift-dev.mk
new file mode 100644
index 0000000000..b8fddbdf77
--- /dev/null
+++ b/platform/centec/libsaithrift-dev.mk
@@ -0,0 +1,7 @@
+# libsaithrift-dev package
+
+LIBSAITHRIFT_DEV_CENTEC = libsaithrift-dev_0.9.4_amd64.deb
+$(LIBSAITHRIFT_DEV_CENTEC)_SRC_PATH = $(SRC_PATH)/SAI
+$(LIBSAITHRIFT_DEV_CENTEC)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(CENTEC_SAI)
+$(LIBSAITHRIFT_DEV_CENTEC)_RDEPENDS += $(LIBTHRIFT) $(CENTEC_SAI)
+SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_CENTEC)
diff --git a/platform/centec/python-saithrift.mk b/platform/centec/python-saithrift.mk
new file mode 100644
index 0000000000..37d1e935c0
--- /dev/null
+++ b/platform/centec/python-saithrift.mk
@@ -0,0 +1,6 @@
+# python-saithrift package
+
+PYTHON_SAITHRIFT_CENTEC = python-saithrift_0.9.4_amd64.deb
+$(PYTHON_SAITHRIFT_CENTEC)_SRC_PATH = $(SRC_PATH)/SAI
+$(PYTHON_SAITHRIFT_CENTEC)_DEPENDS += $(CENTEC_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
+SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_CENTEC)
diff --git a/platform/centec/rules.mk b/platform/centec/rules.mk
index d8c3568f0c..9e53996c0a 100644
--- a/platform/centec/rules.mk
+++ b/platform/centec/rules.mk
@@ -3,6 +3,8 @@ include $(PLATFORM_PATH)/sai.mk
 include $(PLATFORM_PATH)/docker-orchagent-centec.mk
 include $(PLATFORM_PATH)/docker-syncd-centec.mk
 include $(PLATFORM_PATH)/one-image.mk
+include $(PLATFORM_PATH)/libsaithrift-dev.mk
+include $(PLATFORM_PATH)/python-saithrift.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE)
 
diff --git a/platform/mellanox/libsaithrift-dev.mk b/platform/mellanox/libsaithrift-dev.mk
new file mode 100644
index 0000000000..0fc6d3f4eb
--- /dev/null
+++ b/platform/mellanox/libsaithrift-dev.mk
@@ -0,0 +1,7 @@
+# libsaithrift-dev package
+
+LIBSAITHRIFT_DEV_MLNX = libsaithrift-dev_0.9.4_amd64.deb
+$(LIBSAITHRIFT_DEV_MLNX)_SRC_PATH = $(SRC_PATH)/SAI
+$(LIBSAITHRIFT_DEV_MLNX)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(MLNX_SAI) $(MLNX_SAI_DEV)
+$(LIBSAITHRIFT_DEV_MLNX)_RDEPENDS += $(LIBTHRIFT) $(MLNX_SAI)
+SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_MLNX)
diff --git a/platform/mellanox/python-saithrift.mk b/platform/mellanox/python-saithrift.mk
new file mode 100644
index 0000000000..cbe5af29b3
--- /dev/null
+++ b/platform/mellanox/python-saithrift.mk
@@ -0,0 +1,6 @@
+# python-saithrift package
+
+PYTHON_SAITHRIFT_MLNX = python-saithrift_0.9.4_amd64.deb
+$(PYTHON_SAITHRIFT_MLNX)_SRC_PATH = $(SRC_PATH)/SAI
+$(PYTHON_SAITHRIFT_MLNX)_DEPENDS += $(MLNX_SAI_DEV) $(MLNX_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
+SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MLNX)
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
index 5a57e57fbc..f0e8d4fcdb 100644
--- a/platform/mellanox/rules.mk
+++ b/platform/mellanox/rules.mk
@@ -7,6 +7,8 @@ include $(PLATFORM_PATH)/docker-syncd-mlnx.mk
 include $(PLATFORM_PATH)/docker-syncd-mlnx-rpc.mk
 include $(PLATFORM_PATH)/docker-orchagent-mlnx.mk
 include $(PLATFORM_PATH)/one-image.mk
+include $(PLATFORM_PATH)/libsaithrift-dev.mk
+include $(PLATFORM_PATH)/python-saithrift.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM_GOBGP) \
diff --git a/src/SAI b/src/SAI
new file mode 160000
index 0000000000..20f7dffba5
--- /dev/null
+++ b/src/SAI
@@ -0,0 +1 @@
+Subproject commit 20f7dffba5dcb0922a4af6e945804b821a3772c1