diff --git a/Makefile.am b/Makefile.am
index e664bdbb..c50ea295 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,4 +31,5 @@ SUBDIRS = \
   instfiles \
   genkeymap \
   xrdpapi \
+  pkgconfig \
   $(XRDPVRDIR)
diff --git a/configure.ac b/configure.ac
index 27719990..1506264a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,6 +254,10 @@ if test "x${prefix}" = "xNONE" ; then
 sysconfdir="/etc";
 localstatedir="/var";
 fi
+
+pkgconfigdir=${libdir}/pkgconfig
+AC_SUBST(pkgconfigdir)
+
 AC_CONFIG_FILES([Makefile
                  common/Makefile
                  vnc/Makefile
@@ -280,11 +284,13 @@ AC_CONFIG_FILES([Makefile
                  genkeymap/Makefile
                  xrdpapi/Makefile
                  xrdpvr/Makefile
+                 pkgconfig/Makefile
 ])
 #                 fontdump/Makefile
 #                 xrdp/cursors/Makefile
 #                 Xserver/hw/rdp/Makefile
-AC_OUTPUT
+AC_OUTPUT([pkgconfig/libpainter.pc
+])
 
 # example of how to check for a struct in a header
 #AC_CHECK_MEMBER([struct in6_addr.s6_addr],
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
new file mode 100644
index 00000000..8c3b1af2
--- /dev/null
+++ b/pkgconfig/Makefile.am
@@ -0,0 +1,12 @@
+pkg_config_files = \
+	xrdp.pc \
+	$(NULL)
+
+pkgconfigdir = @pkgconfigdir@
+pkgconfig_DATA = $(pkg_config_files)
+
+DISTCLEANFILES = \
+	$(pkg_config_files) \
+	Makefile.in \
+	$(NULL)
+
diff --git a/pkgconfig/xrdp.pc.in b/pkgconfig/xrdp.pc.in
new file mode 100644
index 00000000..dafd32e1
--- /dev/null
+++ b/pkgconfig/xrdp.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: xrdp
+Description: xrdp - an open source RDP server
+Version: 0.9.2
+Cflags: -I${includedir}