diff --git a/.gitmodules b/.gitmodules
index e2f47c5a00e1..fc925a66fc76 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -41,7 +41,8 @@
 	url = https://github.com/Azure/sonic-utilities
 [submodule "platform/broadcom/sonic-platform-modules-s6000"]
 	path = platform/broadcom/sonic-platform-modules-s6000
-	url = https://github.com/Azure/sonic-platform-modules-s6000
+	url = https://github.com/lguohan/sonic-platform-modules-s6000
+	branch = stretch
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk
index 78525c2db646..6dd81e97329f 100755
--- a/platform/broadcom/rules.mk
+++ b/platform/broadcom/rules.mk
@@ -1,6 +1,6 @@
 include $(PLATFORM_PATH)/sdk.mk
 include $(PLATFORM_PATH)/sai.mk
-#include $(PLATFORM_PATH)/platform-modules-s6000.mk
+include $(PLATFORM_PATH)/platform-modules-s6000.mk
 #include $(PLATFORM_PATH)/platform-modules-dell.mk
 #include $(PLATFORM_PATH)/platform-modules-arista.mk
 #include $(PLATFORM_PATH)/platform-modules-ingrasys.mk
diff --git a/platform/broadcom/sonic-platform-modules-s6000 b/platform/broadcom/sonic-platform-modules-s6000
index 1f6c70e7db89..804f9b3015c4 160000
--- a/platform/broadcom/sonic-platform-modules-s6000
+++ b/platform/broadcom/sonic-platform-modules-s6000
@@ -1 +1 @@
-Subproject commit 1f6c70e7db890851510a36892b602c534e4f41a7
+Subproject commit 804f9b3015c4a353ff107722e6516b361eada889
diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 5d89dd5f4a71..14728d72380a 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 5d89dd5f4a71cff548e7aaa4e1e13b2ac4836f1f
+Subproject commit 14728d72380a552848dca91a2d350333ae2d2d0a