diff --git a/Makefile b/Makefile
index 7c0f6ce..dae0a87 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ include Makedefs
 #
 
 DIRS	=	cups filter backend berkeley cgi-bin driver locale man monitor \
-		notifier ppdc scheduler systemv test \
+		notifier pkg-config ppdc scheduler systemv test \
 		$(PHPDIR) \
 		conf data doc examples $(FONTS) templates
 
diff --git a/configure.in b/configure.in
index bf86332..eee15fb 100644
--- a/configure.in
+++ b/configure.in
@@ -71,6 +71,8 @@ AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
 	  man/client.conf.man man/cups-deviced.man man/cups-driverd.man
 	  man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
 	  man/cupsd.conf.man man/drv.man man/lpoptions.man
+	  pkg-config/cups.pc pkg-config/libcupsdriver.pc
+	  pkg-config/libcupsimage.pc pkg-config/libcups.pc
 	  templates/header.tmpl
 	  $LANGFILES)
 
diff --git a/pkg-config/Makefile b/pkg-config/Makefile
new file mode 100644
index 0000000..40d5ff9
--- /dev/null
+++ b/pkg-config/Makefile
@@ -0,0 +1,117 @@
+#
+# "$Id$"
+#
+#   Configuration file makefile for the Common UNIX Printing System (CUPS).
+#
+#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 1993-2006 by Easy Software Products.
+#
+#   These coded instructions, statements, and computer programs are the
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
+#
+
+include ../Makedefs
+
+#
+# Config files...
+#
+
+PKGCONFIG_DEV	=	libcupsdriver.pc libcupsimage.pc libcups.pc
+PKCGONFIG	=	cups.pc
+
+
+#
+# Make everything...
+#
+
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+
+
+#
+# Dummy depend...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+	for file in $(PKGCONFIG_DEV); do \
+		$(INSTALL_DATA) $$file $(LIBDIR)/pkgconfig/$$file ; \
+	done
+	for file in $(PKGCONFIG); do \
+		$(INSTALL_DATA) $$file $(DATADIR)/pkgconfig/$$file ; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	for file in $(PKGCONFIG_DEV); do \
+		$(RM) $(LIBDIR)/pkgconfig/$$file ; \
+	done
+	for file in $(PKGCONFIG); do \
+		$(RM) $(DATADIR)/pkgconfig/$$file ; \
+	done
+
+
+#
+# End of "$Id$".
+#
diff --git a/pkg-config/cups.pc.in b/pkg-config/cups.pc.in
new file mode 100644
index 0000000..50449fd
--- /dev/null
+++ b/pkg-config/cups.pc.in
@@ -0,0 +1,19 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+includedir=@includedir@
+libdir=@libdir@
+imagelibdir=@libdir@
+datarootdir=@datadir@
+sysconfdir=@sysconfdir@
+apiversion="1.4"
+datadir=@CUPS_DATADIR@
+serverbin=@CUPS_SERVERBIN@
+serverroot=@CUPS_SERVERROOT@
+build=@CUPS_BUILD@
+
+Name: cups
+Description: Common UNIX Printing System
+Version: @CUPS_VERSION@
+Libs: 
+CFlags: 
diff --git a/pkg-config/libcups.pc.in b/pkg-config/libcups.pc.in
new file mode 100644
index 0000000..37781e5
--- /dev/null
+++ b/pkg-config/libcups.pc.in
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+includedir=@includedir@
+libdir=@libdir@
+datarootdir=@datadir@
+sysconfdir=@sysconfdir@
+datadir=@datadir@
+
+Name: libcups
+Description: Common UNIX Printing System libraries
+Version: @CUPS_VERSION@
+Libs.private: @EXPORT_LDFLAGS@ @LIBGSSAPI@ @EXPORT_SSLLIBS@ @EXPORT_LIBZ@ @LIBS@
+Libs: -L${libdir} -lcups
+CFlags: -I${includedir}
diff --git a/pkg-config/libcupsdriver.pc.in b/pkg-config/libcupsdriver.pc.in
new file mode 100644
index 0000000..b3d041b
--- /dev/null
+++ b/pkg-config/libcupsdriver.pc.in
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+includedir=@includedir@
+libdir=@libdir@
+datarootdir=@datadir@
+sysconfdir=@sysconfdir@
+datadir=@datadir@
+
+Name: libcupsdriver
+Description: Common UNIX Printing System driver API
+Version: @CUPS_VERSION@
+Requires: libcups
+Libs: -L${libdir} -lcupsdriver
+CFlags: -I${includedir}
diff --git a/pkg-config/libcupsimage.pc.in b/pkg-config/libcupsimage.pc.in
new file mode 100644
index 0000000..a9acd4b
--- /dev/null
+++ b/pkg-config/libcupsimage.pc.in
@@ -0,0 +1,16 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+includedir=@includedir@
+libdir=@libdir@
+datarootdir=@datadir@
+sysconfdir=@sysconfdir@
+datadir=@datadir@
+
+Name: libcupsimage
+Description: Common UNIX Printing System image API
+Version: @CUPS_VERSION@
+Requires: libcups
+Libs.private: @EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@
+Libs: -L${libdir} -lcupsimage
+CFlags: -I${includedir}
