diff --git a/configure.ac b/configure.ac
index 22c22dfd..afd63c15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,4 +317,7 @@ AC_SUBST(DLLIB)
 AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh
 		doc/Makefile doc/common.tex include/libunwind-common.h
                 include/libunwind.h include/tdep/libunwind_i.h)
+AC_CONFIG_FILES(src/unwind/libunwind.pc src/coredump/libunwind-coredump.pc
+                src/ptrace/libunwind-ptrace.pc src/setjmp/libunwind-setjmp.pc
+                src/libunwind-generic.pc:src/libunwind-generic.pc.in)
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 68609774..a7528a1c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,18 @@ endif
 noinst_HEADERS =
 noinst_LTLIBRARIES =
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libunwind-generic.pc
+
+if !REMOTE_ONLY
+pkgconfig_DATA += unwind/libunwind.pc ptrace/libunwind-ptrace.pc         \
+                  setjmp/libunwind-setjmp.pc
+endif
+
+if BUILD_COREDUMP
+pkgconfig_DATA += coredump/libunwind-coredump.pc
+endif
+
 ### libunwind-ptrace:
 libunwind_ptrace_la_SOURCES =						  \
 	ptrace/_UPT_elf.c						  \
diff --git a/src/coredump/libunwind-coredump.pc.in b/src/coredump/libunwind-coredump.pc.in
new file mode 100644
index 00000000..9205c41c
--- /dev/null
+++ b/src/coredump/libunwind-coredump.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libunwind-coredump
+Description: libunwind coredump library
+Version: @VERSION@
+Requires: libunwind-@arch@ libunwind
+Libs: -L${libdir} -lunwind-coredump
diff --git a/src/libunwind-generic.pc.in b/src/libunwind-generic.pc.in
new file mode 100644
index 00000000..89e9814f
--- /dev/null
+++ b/src/libunwind-generic.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libunwind-generic
+Description: libunwind generic library
+Version: @VERSION@
+Requires: libunwind
+Libs: -L${libdir} -lunwind-generic
diff --git a/src/ptrace/libunwind-ptrace.pc.in b/src/ptrace/libunwind-ptrace.pc.in
new file mode 100644
index 00000000..15ce82bc
--- /dev/null
+++ b/src/ptrace/libunwind-ptrace.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libunwind-ptrace
+Description: libunwind ptrace library
+Version: @VERSION@
+Requires: libunwind-@arch@ libunwind
+Libs: -L${libdir} -lunwind-ptrace
diff --git a/src/setjmp/libunwind-setjmp.pc.in b/src/setjmp/libunwind-setjmp.pc.in
new file mode 100644
index 00000000..aa34b7b0
--- /dev/null
+++ b/src/setjmp/libunwind-setjmp.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libunwind-setjmp
+Description: libunwind setjmp library
+Version: @VERSION@
+Requires: libunwind
+Libs: -L${libdir} -lunwind-setjmp
diff --git a/src/unwind/libunwind.pc.in b/src/unwind/libunwind.pc.in
new file mode 100644
index 00000000..c2799ea5
--- /dev/null
+++ b/src/unwind/libunwind.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libunwind
+Description: libunwind base library
+Version: @VERSION@
+Libs: -L${libdir} -lunwind