diff --git a/Makefile.am b/Makefile.am
index 5c4e7db2..f54ce7b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,10 @@ libtag_la_LIBADD = ./mpeg/libmpeg.la ./ogg/libogg.la ./flac/libflac.la ./mpc/lib
 
 bin_SCRIPTS = taglib-config
 
-EXTRA_DIST = $(libtag_la_SOURCES) $(taglib_include_HEADERS)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = taglib.pc
+
+EXTRA_DIST = $(libtag_la_SOURCES) $(taglib_include_HEADERS) $(pkgconfig_DATA)
 
 examples: examples-all
 
diff --git a/configure.in.in b/configure.in.in
index 9d678d6d..5e9bf287 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,6 +1,7 @@
 #AM_INIT_AUTOMAKE(taglib,1.0)
 dnl don't remove the below
 dnl AC_OUTPUT(taglib/taglib-config)
+dnl AC_OUTPUT(taglib/taglib.pc)
 
 AC_DEFUN([AC_HAVE_ZLIB],
 [
diff --git a/taglib.pc.in b/taglib.pc.in
new file mode 100644
index 00000000..664380b6
--- /dev/null
+++ b/taglib.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: TagLib
+Description: Audio meta-data library
+Requires: 
+Version: @VERSION@
+Libs: -L${libdir} -ltag
+Cflags: -I${includedir}/taglib