diff --git a/Makefile.am b/Makefile.am
index a2a084f1..b6b33115 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.4 2003/04/20 15:34:31 rocky Exp $
+#   $Id: Makefile.am,v 1.5 2003/04/21 10:17:50 hvr Exp $
 #
 #    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 #
@@ -25,6 +25,12 @@ EXTRA_DIST = libpopt.m4 THANKS
 # SUBDIRS =  doc include lib src tests
 SUBDIRS =  include lib src tests
 
+# pkg-config(1) related rules
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libcdio.pc
+
+$(pkgconfig_DATA): config.status
+
 # List of additional files for expanded regression tests
 DISTFILES_REGRESSION = tests/monvoisin.nrg  tests/monvoisin.right \
 	               tests/svcd_ogt_test_ntsc.bin \
diff --git a/configure.ac b/configure.ac
index 5620f074..2355c0f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_REVISION([$Id: configure.ac,v 1.14 2003/04/20 17:24:48 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.15 2003/04/21 10:17:50 hvr Exp $])dnl
 AC_INIT(lib/cdio.c)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(libcdio, 0.3)
@@ -215,6 +215,7 @@ AC_CONFIG_COMMANDS([checks],
 
 AC_OUTPUT([ \
        Makefile \
+       libcdio.pc \
        include/Makefile \
        include/cdio/Makefile \
        include/cdio/cdio.h \
diff --git a/include/cdio/cdio.h.in b/include/cdio/cdio.h.in
index 07514345..189d1205 100644
--- a/include/cdio/cdio.h.in
+++ b/include/cdio/cdio.h.in
@@ -1,5 +1,5 @@
-/*
-    $Id: cdio.h.in,v 1.2 2003/04/20 17:24:49 rocky Exp $
+/* -*- c -*-
+    $Id: cdio.h.in,v 1.3 2003/04/21 10:17:50 hvr Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
diff --git a/libcdio.pc.in b/libcdio.pc.in
new file mode 100644
index 00000000..550884f7
--- /dev/null
+++ b/libcdio.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libcdio
+Description: Portable CD-ROM I/O library
+Version: @VERSION@
+Requires: glib-2.0 
+Libs: -L${libdir} -lcdio
+Cflags: -I${includedir}