--- a/components/libffi/libffi.p5m	Fri Nov 18 08:49:15 2016 -0800
+++ b/components/libffi/libffi.p5m	Fri Nov 18 13:15:14 2016 -0800
@@ -35,14 +35,16 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/542
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/include/ffi.h
-file path=usr/include/ffitarget.h
+file path=usr/lib/$(MACH64)/libffi-$(COMPONENT_VERSION)/include/ffi.h
+file path=usr/lib/$(MACH64)/libffi-$(COMPONENT_VERSION)/include/ffitarget.h
 link path=usr/lib/$(MACH64)/libffi.so target=libffi.so.6.0.4
 link path=usr/lib/$(MACH64)/libffi.so.5 target=libffi.so.6
 link path=usr/lib/$(MACH64)/libffi.so.5.0.10 target=libffi.so.6.0.4
 link path=usr/lib/$(MACH64)/libffi.so.6 target=libffi.so.6.0.4
 file path=usr/lib/$(MACH64)/libffi.so.6.0.4
 file path=usr/lib/$(MACH64)/pkgconfig/libffi.pc
+file path=usr/lib/libffi-$(COMPONENT_VERSION)/include/ffi.h
+file path=usr/lib/libffi-$(COMPONENT_VERSION)/include/ffitarget.h
 link path=usr/lib/libffi.so target=libffi.so.6.0.4
 link path=usr/lib/libffi.so.5 target=libffi.so.6
 link path=usr/lib/libffi.so.5.0.10 target=libffi.so.6.0.4
@@ -52,4 +54,5 @@
 file path=usr/share/man/man3/ffi.3
 file path=usr/share/man/man3/ffi_call.3
 file path=usr/share/man/man3/ffi_prep_cif.3
+file path=usr/share/man/man3/ffi_prep_cif_var.3
 license LICENSE license=MIT