diff --git a/src/tools/Makefile b/src/tools/Makefile
index e597e68d2..cd364519d 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -58,6 +58,8 @@ C_CFLAGS += $(filter-out -g,$(filter-out -O%,$(filter-out -W%,$(CPPFLAGS))))
 C_CFLAGS += $(filter-out -g,$(filter-out -O%,$(filter-out -W%,$(CFLAGS))))
 PKGVARS += FINAL_LOCATION OS_CLASS CMPLR_CLASS C_CFLAGS LDFLAGS LDLIBS
 PKGVARS += EPICS_VERSION EPICS_REVISION EPICS_MODIFICATION EPICS_PATCH_LEVEL
+PKGVARS += CC CCC CPP AR LD
+PKGVARS += EPICS_BASE_IOC_LIBS
 
 EXPANDFLAGS += $(foreach var,$(PKGVARS),-D$(var)="$(strip $($(var)))")
 PKGCONFIG += epics-base-$(T_A).pc
diff --git a/src/tools/epics-base-arch.pc@ b/src/tools/epics-base-arch.pc@
index c75d02684..8e30cd30e 100644
--- a/src/tools/epics-base-arch.pc@
+++ b/src/tools/epics-base-arch.pc@
@@ -1,20 +1,37 @@
-# non-standard variables
-top=@FINAL_LOCATION@
-arch=@ARCH@
-os_class=@OS_CLASS@
-cmplr_class=@CMPLR_CLASS@
+# standard variables
+prefix=@FINAL_LOCATION@
+exec_prefix=${prefix}
+bindir=${prefix}/bin/@ARCH@
+libdir=${prefix}/lib/@ARCH@
 
-includedir_osi=${top}/include
-includedir_osd=${top}/include/os/@OS_CLASS@
-includedir_comp=${top}/include/compiler/@CMPLR_CLASS@
+# non-standard variables
+
+# EPICS Base install location
+FINAL_LOCATION=${prefix}
+ARCH=@ARCH@
+OS_CLASS=@OS_CLASS@
+CMPLR_CLASS=@CMPLR_CLASS@
+
+EPICS_BASE_IOC_LIBS=@EPICS_BASE_IOC_LIBS@
+
+# Directories
+
+includedir_osi=${prefix}/include
+includedir_osd=${prefix}/include/os/@OS_CLASS@
+includedir_comp=${prefix}/include/compiler/@CMPLR_CLASS@
 
 includedirs=${includedir_osi} ${includedir_osd} ${includedir_comp}
 
-# standard variables
-prefix=@FINAL_LOCATION@
-exec_prefix=@FINAL_LOCATION@
-bindir=${top}/bin/@ARCH@
-libdir=${top}/lib/@ARCH@
+dbddir=${prefix}/dbd
+dbdir=${prefix}/db
+
+# Tool chain
+
+CC=@CC@
+CXX=@CCC@
+CPP=@CPP@
+AR=@AR@
+LD=@LD@
 
 Name: epics-base-@ARCH@
 Version: @EPICS_VERSION@.@EPICS_REVISION@.@EPICS_MODIFICATION@.@EPICS_PATCH_LEVEL@
diff --git a/src/tools/epics-base.pc@ b/src/tools/epics-base.pc@
index 08cfdcc33..c1540666a 100644
--- a/src/tools/epics-base.pc@
+++ b/src/tools/epics-base.pc@
@@ -1,20 +1,27 @@
-# non-standard variables
-top=@FINAL_LOCATION@
-arch=@ARCH@
-os_class=@OS_CLASS@
-cmplr_class=@CMPLR_CLASS@
+# standard variables
+prefix=@FINAL_LOCATION@
+exec_prefix=${prefix}
+bindir=${prefix}/bin/@ARCH@
+libdir=${prefix}/lib/@ARCH@
 
-includedir_osi=${top}/include
-includedir_osd=${top}/include/os/@OS_CLASS@
-includedir_comp=${top}/include/os/@CMPLR_CLASS@
+# non-standard variables
+
+# EPICS Base install location
+FINAL_LOCATION=${prefix}
+ARCH=@ARCH@
+OS_CLASS=@OS_CLASS@
+CMPLR_CLASS=@CMPLR_CLASS@
+
+# Directories
+
+includedir_osi=${prefix}/include
+includedir_osd=${prefix}/include/os/@OS_CLASS@
+includedir_comp=${prefix}/include/compiler/@CMPLR_CLASS@
 
 includedirs=${includedir_osi} ${includedir_osd} ${includedir_comp}
 
-# standard variables
-prefix=@FINAL_LOCATION@
-exec_prefix=@FINAL_LOCATION@
-bindir=${top}/bin/@ARCH@
-libdir=${top}/lib/@ARCH@
+dbddir=${prefix}/dbd
+dbdir=${prefix}/db
 
 Name: epics-base
 Version: @EPICS_VERSION@.@EPICS_REVISION@.@EPICS_MODIFICATION@.@EPICS_PATCH_LEVEL@