--- a/components/mysql-5-6/Makefile	Mon May 11 13:44:23 2015 -0700
+++ b/components/mysql-5-6/Makefile	Mon May 11 16:28:43 2015 -0700
@@ -21,8 +21,6 @@
 # Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-export PARFAIT_BUILD=no
-
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME        = mysql

--- a/components/samba/samba/Makefile	Mon May 11 13:44:23 2015 -0700
+++ b/components/samba/samba/Makefile	Mon May 11 16:28:43 2015 -0700
@@ -31,6 +31,9 @@
 COMPILER =	gcc
 endif
 
+# parfait seems to spin on us
+export PARFAIT_BUILD=no
+
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		samba

--- a/components/text-utilities/Makefile	Mon May 11 13:44:23 2015 -0700
+++ b/components/text-utilities/Makefile	Mon May 11 16:28:43 2015 -0700
@@ -21,6 +21,9 @@
 # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
+# parfait fails to compile us (20889777)
+export PARFAIT_BUILD=no
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		text-utilities

--- a/make-rules/shared-macros.mk	Mon May 11 13:44:23 2015 -0700
+++ b/make-rules/shared-macros.mk	Mon May 11 16:28:43 2015 -0700
@@ -395,7 +395,7 @@
 SPRO_ROOT =	$(BUILD_TOOLS)/SUNWspro
 SPRO_VROOT =	$(SPRO_ROOT)/solarisstudio12.4
 
-PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.5.1
+PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.6.1
 PARFAIT_TOOLS=	$(WS_TOOLS)/$(MACH)/parfait
 PARFAIT_TOOLS_GCC3=	$(PARFAIT_TOOLS)/gcc3
 PARFAIT= $(PARFAIT_ROOT)/bin/parfait
@@ -946,7 +946,7 @@
 endif
 ifeq ($(PARFAIT_BUILD),yes)
 # uncomment this line if you need to install Parfait
-#REQUIRED_PACKAGES += developer/parfait/parfait-tools-151
+#REQUIRED_PACKAGES += developer/parfait/parfait-tools-161
 endif
 REQUIRED_PACKAGES += developer/versioning/mercurial
 REQUIRED_PACKAGES += file/gnu-findutils