--- a/components/autogen/autogen.p5m	Wed Jan 20 16:41:39 2016 +0000
+++ b/components/autogen/autogen.p5m	Wed Jan 20 10:50:52 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -35,6 +35,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/315 value=PSARC/2012/367
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/$(MACH64)/autogen target=../autogen
 file path=usr/bin/$(MACH64)/autoopts-config
 file usr/bin/$(MACH64)/autogen path=usr/bin/autogen
 file path=usr/bin/autoopts-config
@@ -47,11 +48,13 @@
 link path=usr/lib/$(MACH64)/libopts.so target=libopts.so.25.11.5
 link path=usr/lib/$(MACH64)/libopts.so.25 target=libopts.so.25.11.5
 file path=usr/lib/$(MACH64)/libopts.so.25.11.5
+file $(MACH64)/autoopts/pkgconfig/autoopts.pc \
+    path=usr/lib/$(MACH64)/pkgconfig/autoopts.pc
 file path=usr/lib/libopts.a
 link path=usr/lib/libopts.so target=libopts.so.25.11.5
 link path=usr/lib/libopts.so.25 target=libopts.so.25.11.5
 file path=usr/lib/libopts.so.25.11.5
-file usr/share/pkgconfig/autoopts.pc path=usr/lib/pkgconfig/autoopts.pc
+file $(MACH32)/autoopts/pkgconfig/autoopts.pc path=usr/lib/pkgconfig/autoopts.pc
 file path=usr/share/aclocal/autoopts.m4
 file path=usr/share/autogen/aginfo.tpl
 file path=usr/share/autogen/aginfo3.tpl