diff --git a/lib/libpacemaker.pc.in b/lib/libpacemaker.pc.in
index 40c68028d6..1aa8f82b32 100644
--- a/lib/libpacemaker.pc.in
+++ b/lib/libpacemaker.pc.in
@@ -1,16 +1,14 @@
-prefix=@prefix@
+sub=pacemaker
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE_TARNAME@
 
-build=@BUILD_VERSION@
-
-Name:         lib@PACKAGE_NAME@
-URL:	      @PACKAGE_URL@
-Version:      @PACKAGE_VERSION@
-Description:  Pacemaker cluster manager v@PACKAGE_SERIES@
-Requires:     
-Conflicts:    
-Cflags:       -I${includedir}
-Libs:         -L${libdir} -l@PACKAGE_NAME@
+Name:             lib${sub}
+URL:              @PACKAGE_URL@
+Version:          @PACKAGE_VERSION@
+Description:      High-level APIs for Pacemaker
+Requires:         pacemaker-pe_status pacemaker-cib pacemaker-lrmd pacemaker
+Requires.private: glib-2.0 libxml-2.0
+Conflicts:
+Cflags:           -I${includedir}
+Libs:             -L${libdir} -l${sub}
 Libs.private:
-
diff --git a/lib/pacemaker-cib.pc.in b/lib/pacemaker-cib.pc.in
index af9ea9b2fc..de18cc704b 100644
--- a/lib/pacemaker-cib.pc.in
+++ b/lib/pacemaker-cib.pc.in
@@ -1,20 +1,18 @@
 sub=cib
-prefix=@prefix@
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE_TARNAME@
 
-build=@BUILD_VERSION@
-
 configdir=@CRM_CONFIG_DIR@
 schemadir=@CRM_SCHEMA_DIRECTORY@
 
-Name:         @PACKAGE_NAME@-${sub}
-URL:	      @PACKAGE_URL@
-Version:      @PACKAGE_VERSION@
-Description:  Pacemaker cluster manager v@PACKAGE_SERIES@
-Requires:     
-Conflicts:    
-Cflags:       -I${includedir}
-Libs:         -L${libdir} -l${sub}
+Name:             lib${sub}
+URL:              @PACKAGE_URL@
+Version:          @PACKAGE_VERSION@
+Description:      Configuration Information Base (CIB) APIs for Pacemaker
+Requires:         pacemaker-pe_rules pacemaker
+# @TODO if HAVE_GNUTLS_GNUTLS_H is true, add gnutls
+Requires.private: glib-2.0 libxml-2.0
+Conflicts:
+Cflags:           -I${includedir}
+Libs:             -L${libdir} -l${sub}
 Libs.private:
-
diff --git a/lib/pacemaker-cluster.pc.in b/lib/pacemaker-cluster.pc.in
index 9a7adfcdaa..0e645b27ec 100644
--- a/lib/pacemaker-cluster.pc.in
+++ b/lib/pacemaker-cluster.pc.in
@@ -1,34 +1,15 @@
-sub=cluster
-prefix=@prefix@
+sub=crmcluster
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE_TARNAME@
 
-build=@BUILD_VERSION@
-
-daemon_group=@CRM_DAEMON_GROUP@
-daemon_user=@CRM_DAEMON_USER@
-
-daemondir=@CRM_DAEMON_DIR@
-blackboxdir=@CRM_BLACKBOX_DIR@
-configdir=@CRM_CONFIG_DIR@
-penginedir=@PE_STATE_DIR@
-coredir=@CRM_CORE_DIR@
-statedir=@CRM_STATE_DIR@
-schemadir=@CRM_SCHEMA_DIRECTORY@
-ocfdir=@OCF_RA_DIR@
-
-features=@PCMK_FEATURES@
-with_corosync=@SUPPORT_COROSYNC@
-
-with_upstart=@SUPPORT_UPSTART@
-with_systemd=@SUPPORT_SYSTEMD@
-
-Name:         @PACKAGE_NAME@-${sub}
-URL:	      @PACKAGE_URL@
-Version:      @PACKAGE_VERSION@
-Description:  Pacemaker cluster manager v@PACKAGE_SERIES@
-Requires:     
-Conflicts:    
-Cflags:       -I${includedir}
-Libs:         -L${libdir} -lcrm${sub}
+Name:             lib${sub}
+URL:              @PACKAGE_URL@
+Version:          @PACKAGE_VERSION@
+Description:      Cluster layer APIs for Pacemaker
+# @TODO Create an equivalent of $(CLUSTERLIBS) to use here
+Requires:         pacemaker-fencing pacemaker
+Requires.private: libqb glib-2.0 libxml-2.0
+Conflicts:
+Cflags:           -I${includedir}
+Libs:             -L${libdir} -l${sub}
 Libs.private:
diff --git a/lib/pacemaker-fencing.pc.in b/lib/pacemaker-fencing.pc.in
index 95172f725e..30191caed0 100644
--- a/lib/pacemaker-fencing.pc.in
+++ b/lib/pacemaker-fencing.pc.in
@@ -1,17 +1,14 @@
-sub=fencing
-prefix=@prefix@
+sub=stonithd
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE_TARNAME@
 
-build=@BUILD_VERSION@
-
-Name:         @PACKAGE_NAME@-${sub}
-URL:	      @PACKAGE_URL@
-Version:      @PACKAGE_VERSION@
-Description:  Pacemaker cluster manager v@PACKAGE_SERIES@
-Requires:     
-Conflicts:    
-Cflags:       -I${includedir}
-Libs:         -L${libdir} -lstonithd
+Name:             lib${sub}
+URL:              @PACKAGE_URL@
+Version:          @PACKAGE_VERSION@
+Description:      Fencing APIs for Pacemaker
+Requires:         pacemaker-service pacemaker
+Requires.private: glib-2.0 libxml-2.0
+Conflicts:
+Cflags:           -I${includedir}
+Libs:             -L${libdir} -l${sub}
 Libs.private:
-
diff --git a/lib/pacemaker-lrmd.pc.in b/lib/pacemaker-lrmd.pc.in
index ecf0a14e02..f131f6a521 100644
--- a/lib/pacemaker-lrmd.pc.in
+++ b/lib/pacemaker-lrmd.pc.in
@@ -1,21 +1,15 @@
 sub=lrmd
-prefix=@prefix@
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE_TARNAME@
 
-build=@BUILD_VERSION@
-
-ocfdir=@OCF_RA_DIR@
-with_upstart=@SUPPORT_UPSTART@
-with_systemd=@SUPPORT_SYSTEMD@
-
-Name:         @PACKAGE_NAME@-${sub}
-URL:	      @PACKAGE_URL@
-Version:      @PACKAGE_VERSION@
-Description:  Pacemaker cluster manager v@PACKAGE_SERIES@
-Requires:     
-Conflicts:    
-Cflags:       -I${includedir}
-Libs:         -L${libdir} -l${sub}
+Name:             lib${sub}
+URL:              @PACKAGE_URL@
+Version:          @PACKAGE_VERSION@
+Description:      Executor APIs for Pacemaker
+Requires:         pacemaker-fencing pacemaker-service pacemaker
+# @TODO if HAVE_GNUTLS_GNUTLS_H is true, add gnutls
+Requires.private: glib-2.0 libxml-2.0
+Conflicts:
+Cflags:           -I${includedir}
+Libs:             -L${libdir} -l${sub}
 Libs.private:
-
diff --git a/lib/pacemaker-pe_rules.pc.in b/lib/pacemaker-pe_rules.pc.in
index 60f4ec17d7..bd442f9111 100644
--- a/lib/pacemaker-pe_rules.pc.in
+++ b/lib/pacemaker-pe_rules.pc.in
@@ -1,17 +1,15 @@
 sub=pe_rules
-prefix=@prefix@
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE_TARNAME@
 
-build=@BUILD_VERSION@
-
-Name:         @PACKAGE_NAME@-${sub}
-URL:	      @PACKAGE_URL@
-Version:      @PACKAGE_VERSION@
-Description:  Pacemaker cluster manager v@PACKAGE_SERIES@
-Requires:     
-Conflicts:    
-Cflags:       -I${includedir}
-Libs:         -L${libdir} -l${sub}
+Name:             lib${sub}
+URL:              @PACKAGE_URL@
+Version:          @PACKAGE_VERSION@
+Description:      Scheduler rule APIs for Pacemaker
+# pe_rules isn't very useful without glib hash table API
+Requires:         pacemaker glib-2.0
+Requires.private: libxml-2.0
+Conflicts:
+Cflags:           -I${includedir}
+Libs:             -L${libdir} -l${sub}
 Libs.private:
-
diff --git a/lib/pacemaker-pe_status.pc.in b/lib/pacemaker-pe_status.pc.in
index 681782ec87..09bbd993f0 100644
--- a/lib/pacemaker-pe_status.pc.in
+++ b/lib/pacemaker-pe_status.pc.in
@@ -1,17 +1,17 @@
 sub=pe_status
-prefix=@prefix@
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE_TARNAME@
 
-build=@BUILD_VERSION@
+penginedir=@PE_STATE_DIR@
 
-Name:         @PACKAGE_NAME@-${sub}
-URL:	      @PACKAGE_URL@
-Version:      @PACKAGE_VERSION@
-Description:  Pacemaker cluster manager v@PACKAGE_SERIES@
-Requires:     
-Conflicts:    
-Cflags:       -I${includedir}
-Libs:         -L${libdir} -l${sub}
+Name:             lib${sub}
+URL:              @PACKAGE_URL@
+Version:          @PACKAGE_VERSION@
+Description:      Scheduler APIs for Pacemaker
+Requires:         pacemaker
+# @TODO Create equivalent of $(CURSESLIBS) and add here
+Requires.private: glib-2.0 libxml-2.0
+Conflicts:
+Cflags:           -I${includedir}
+Libs:             -L${libdir} -l${sub}
 Libs.private:
-
diff --git a/lib/pacemaker-service.pc.in b/lib/pacemaker-service.pc.in
index 5af1c60bf5..9dad626812 100644
--- a/lib/pacemaker-service.pc.in
+++ b/lib/pacemaker-service.pc.in
@@ -1,21 +1,19 @@
-sub=service
-prefix=@prefix@
+sub=crmservice
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE_TARNAME@
 
-build=@BUILD_VERSION@
-
 ocfdir=@OCF_RA_DIR@
-with_upstart=@SUPPORT_UPSTART@
-with_systemd=@SUPPORT_SYSTEMD@
 
-Name:         @PACKAGE_NAME@-${sub}
-URL:	      @PACKAGE_URL@
-Version:      @PACKAGE_VERSION@
-Description:  Pacemaker cluster manager v@PACKAGE_SERIES@
-Requires:     
-Conflicts:    
-Cflags:       -I${includedir}
-Libs:         -L${libdir} -lcrm${sub}
+Name:             lib${sub}
+URL:              @PACKAGE_URL@
+Version:          @PACKAGE_VERSION@
+Description:      Service APIs for Pacemaker
+# pacemaker-service is not very useful without glib hash table and list APIs
+Requires:         pacemaker glib-2.0
+# @TODO Create equivalent of DBUS_LIBS and add here if HAVE_dbus is true
+Requires.private: libxml-2.0
+Conflicts:
+Cflags:           -I${includedir}
+Libs:             -L${libdir} -l${sub}
+# @TODO Add -lrt if HAVE_SCHED_SETSCHEDULER is true
 Libs.private:
-
diff --git a/lib/pacemaker.pc.in b/lib/pacemaker.pc.in
index 74d120b6de..fa38583189 100644
--- a/lib/pacemaker.pc.in
+++ b/lib/pacemaker.pc.in
@@ -1,33 +1,24 @@
-prefix=@prefix@
+sub=crmcommon
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE_TARNAME@
 
-build=@BUILD_VERSION@
-
 daemon_group=@CRM_DAEMON_GROUP@
 daemon_user=@CRM_DAEMON_USER@
-
 daemondir=@CRM_DAEMON_DIR@
 blackboxdir=@CRM_BLACKBOX_DIR@
-configdir=@CRM_CONFIG_DIR@
-penginedir=@PE_STATE_DIR@
 coredir=@CRM_CORE_DIR@
 statedir=@CRM_STATE_DIR@
-schemadir=@CRM_SCHEMA_DIRECTORY@
-ocfdir=@OCF_RA_DIR@
-
 features=@PCMK_FEATURES@
-with_corosync=@SUPPORT_COROSYNC@
-
-with_upstart=@SUPPORT_UPSTART@
-with_systemd=@SUPPORT_SYSTEMD@
 
-Name:         @PACKAGE_NAME@
-URL:	      @PACKAGE_URL@
-Version:      @PACKAGE_VERSION@
-Description:  Pacemaker cluster manager v@PACKAGE_SERIES@
-Requires:     
-Conflicts:    
-Cflags:       -I${includedir}
-Libs:         -L${libdir} -lcrmcommon
-Libs.private:
+Name:             lib${sub}
+URL:              @PACKAGE_URL@
+Version:          @PACKAGE_VERSION@
+Description:      Low-level common APIs for Pacemaker
+# Some pacemaker APIs are extensions to libqb APIs
+Requires:         libqb
+# @TODO if HAVE_GNUTLS_GNUTLS_H is true, add gnutls
+Requires.private: glib-2.0 libxslt libxml-2.0 uuid
+Conflicts:
+Cflags:           -I${includedir}
+Libs:             -L${libdir} -l${sub}
+Libs.private:     @LIBADD_DL@ -lbz2