diff --git a/.gitmodules b/.gitmodules
index e1e0e07eaad8..d65206f76b7c 100755
--- 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 0e4551718547..680b03afdf41 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 ed9ea067b5cb..168674d34148 160000
--- a/platform/broadcom/sonic-platform-modules-s6000
+++ b/platform/broadcom/sonic-platform-modules-s6000
@@ -1 +1 @@
-Subproject commit ed9ea067b5cbfd7d1c835a903729f9dc28d3b035
+Subproject commit 168674d34148fbf7e8a989edae6a341272a9cffa