--- a/make-rules/shared-targets.mk	Wed Mar 30 10:16:56 2016 -0700
+++ b/make-rules/shared-targets.mk	Wed Mar 30 13:33:31 2016 -0700
@@ -18,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -29,21 +31,14 @@
 PROTOMAN1MFILES=$(MAN1MFILES:%=$(PROTOUSRSHAREMAN1MDIR)/%)
 PROTOMAN3FILES=$(MAN3FILES:%=$(PROTOUSRSHAREMAN3DIR)/%)
 PROTOMAN4FILES=$(MAN4FILES:%=$(PROTOUSRSHAREMAN4DIR)/%)
+PROTOMAN5FILES=$(MAN5FILES:%=$(PROTOUSRSHAREMAN5DIR)/%)
+PROTOMAN8FILES=$(MAN8FILES:%=$(PROTOUSRSHAREMAN8DIR)/%)
 
 $(PROTOUSRSHAREMAN1DIR)/% $(PROTOUSRSHAREMAN1MDIR)/% $(PROTOUSRSHAREMAN3DIR)/% \
-$(PROTOUSRSHAREMAN4DIR)/%:    manpages/%
+$(PROTOUSRSHAREMAN4DIR)/% $(PROTOUSRSHAREMAN5DIR)/% $(PROTOUSRSHAREMAN8DIR)/%: \
+	manpages/%
 	$(INS.file)
 
-PROTOSFWLINKS= $(SFWPROGS:%=$(PROTOSFWBIN)/%)
-
-$(PROTOSFWLINKS):	$(PROTOSFWBIN)
-	$(RM) $@ ; $(SYMLINK) ../../bin/$(@F) $@
-
-PROTOSFWMAN1LINKS= $(SFWMAN1:%=$(PROTOSFWSHAREMAN1)/%)
-
-$(PROTOSFWMAN1LINKS):	$(PROTOSFWSHAREMAN1)
-	$(RM) $@ ; $(SYMLINK) ../../../../share/man/man1/$(@F) $@
-
 PROTOGNULINKS= $(GNUPROGS:%=$(PROTOGNUBIN)/%)
 
 $(PROTOGNULINKS):       $(PROTOGNUBIN)
@@ -63,11 +58,11 @@
 $(PROTOUSRSHAREMAN1MDIR) \
 $(PROTOUSRSHAREMAN3DIR) \
 $(PROTOUSRSHAREMAN4DIR) \
+$(PROTOUSRSHAREMAN5DIR) \
+$(PROTOUSRSHAREMAN8DIR) \
 $(PROTOUSRSHAREDOCDIR) \
 $(PROTOGNUBIN) \
 $(PROTOGNUSHAREMAN1) \
-$(PROTOSFWBIN) \
-$(PROTOSFWSHAREMAN1) \
 $(PROTOUSRSBINDIR) \
 $(PROTOUSRBINDIR):
 	$(MKDIR) $@
@@ -80,3 +75,7 @@
 $(PROTOMAN3FILES): $(PROTOUSRSHAREMAN3DIR)
 
 $(PROTOMAN4FILES): $(PROTOUSRSHAREMAN4DIR)
+
+$(PROTOMAN5FILES): $(PROTOUSRSHAREMAN5DIR)
+
+$(PROTOMAN8FILES): $(PROTOUSRSHAREMAN8DIR)