diff --git a/.hgtags b/.hgtags
index 24cbb8171594511a20b80470f37ac458b36c316b..0e2b605291aff3d2e8084b4c99dcd6c84adc94cd 100644
--- a/.hgtags
+++ b/.hgtags
@@ -739,6 +739,7 @@ a5fbc6967cf5d170be56c9804b90ebb6bbd02832 jdk8u65-b12
 ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14
 03ca585abe68e4dcce5bc162a0fa0593eb8fa2ee jdk8u65-b15
 b4137dc9b1a83409fbd2b80d2ffd5ae949cd7a6b jdk8u65-b16
+8e9c73f18f7e565f1d2100fab7cb8e9e785b1991 jdk8u65-b17
 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00
 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01
 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02
@@ -754,5 +755,6 @@ ab64d7ea4f48ea4bdbcc43d4a653be157d9c29e3 jdk8u66-b12
 9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14
 5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15
 4bbf0e9196f2786e0bc4f17664e2533808d944bf jdk8u66-b16
+a6f2a7ba281291f5dab79fa494f7cfaa6232c88b jdk8u66-b17
 b8f426369187c32551f0a3d571d933908988c81c jdk8u72-b00
 c0205eddb31766ece562483595ec28a7506971e9 jdk8u72-b01
diff --git a/make/solaris/makefiles/buildtree.make b/make/solaris/makefiles/buildtree.make
index 4b68a7c13c2eabd9b63701a645fd7c67ce14ff85..e5dbbc6bb8058f8fdae3c2459f3fabf0892b1bda 100644
--- a/make/solaris/makefiles/buildtree.make
+++ b/make/solaris/makefiles/buildtree.make
@@ -265,9 +265,12 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
 	    echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
 	    echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
 	echo; \
+	[ -n "$(INCLUDE_TRACE)" ] && \
+	    echo && echo "INCLUDE_TRACE = $(INCLUDE_TRACE)"; \
 	[ -n "$(SPEC)" ] && \
 	    echo "include $(SPEC)"; \
 	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
+	echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \
 	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
 	) > $@
 
diff --git a/make/solaris/makefiles/vm.make b/make/solaris/makefiles/vm.make
index 005ba844611c0413fc1afc7056fa546dab772764..11942b4ecfed74e940d65547486f83bdba301281 100644
--- a/make/solaris/makefiles/vm.make
+++ b/make/solaris/makefiles/vm.make
@@ -204,7 +204,7 @@ SHARK_SPECIFIC_FILES     := shark
 ZERO_SPECIFIC_FILES      := zero
 
 # Always exclude these.
-Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
+Src_Files_EXCLUDE += dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
 
 # Exclude per type.
 Src_Files_EXCLUDE/CORE      := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp