diff --git a/.cvsignore b/.cvsignore
index 3cec1e0378..2ce00a171f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,6 +6,7 @@ config.h.in
 Makefile
 Makefile.in
 [Nn]etwork[Mm]anager-*.tar.gz
+NetworkManager.pc
 autom4te.cache
 aclocal.m4
 mkinstalldirs
diff --git a/ChangeLog b/ChangeLog
index b489029656..d2f757a6f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
-2004-09-01  Amanpreet Singh Alam<aalam@redhat.com>
-	* configure.in: Punjabi(pa) is add to po/
+2004-09-01  Colin Walters  <walters@verbum.org>
+
+	* NetworkManager.pc.in: New file.
+
+	* Makefile.am, .cvsignore, configure.in: Add NetworkManager.pc.
+
+2004-09-01  Amanpreet Singh Alam  <aalam@redhat.com>
+	
+	* configure.in: Punjabi(pa) is added to po/.
 
 2004-08-31  Dan Williams <dcbw@redhat.com>
 
diff --git a/Makefile.am b/Makefile.am
index d94469c1db..b8877fb813 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,7 @@
 SUBDIRS = src dispatcher-daemon info-daemon panel-applet initscript test po
 
-EXTRA_DIST = CONTRIBUTING
+EXTRA_DIST = CONTRIBUTING NetworkManager.pc.in
+
+pkgconfigdir = $(libdir)/pkgconfig
+
+pkgconfig_DATA = NetworkManager.pc
diff --git a/NetworkManager.pc.in b/NetworkManager.pc.in
new file mode 100644
index 0000000000..3ffcc5389c
--- /dev/null
+++ b/NetworkManager.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+libgnome_serverdir=@libexecdir@
+
+Name: NetworkManager
+Description: System for maintaining active network connection
+Requires: dbus-1
+Version: @VERSION@
diff --git a/configure.in b/configure.in
index 1ef71ee198..09461455c3 100644
--- a/configure.in
+++ b/configure.in
@@ -140,6 +140,7 @@ initscript/Makefile
 initscript/RedHat/Makefile
 initscript/Gentoo/Makefile
 po/Makefile.in
+NetworkManager.pc
 ])
 
 echo