diff --git a/Makefile.in b/Makefile.in
index 55d350ba..82a43e33 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,6 +18,7 @@ LDFLAGS  := @LDFLAGS@
 LIBS     := @LIBS@
 LIBZNC   := @LIBZNC@
 LIBZNCDIR:= @LIBZNCDIR@
+PKGCONFIGDIR := $(prefix)/lib/pkgconfig
 
 LIB_SRCS  := ZNCString.cpp Csocket.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \
 	DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \
@@ -73,10 +74,12 @@ distclean: clean
 install: znc $(LIBZNC)
 	mkdir -p $(DESTDIR)$(bindir)
 	mkdir -p $(DESTDIR)$(includedir)/znc
+	mkdir -p $(DESTDIR)$(PKGCONFIGDIR)
 	install -m 0755 znc $(DESTDIR)$(bindir)
 	install -m 0755 znc-config $(DESTDIR)$(bindir)
 	install -m 0755 znc-buildmod $(DESTDIR)$(bindir)
 	install -m 0644 $(srcdir)/*.h $(DESTDIR)$(includedir)/znc
+	install -m 0644 znc.pc $(DESTDIR)$(PKGCONFIGDIR)
 	@if test -n "$(LIBZNC)"; then \
 		mkdir -p $(DESTDIR)$(LIBZNCDIR) ; \
 		install -m 0755 $(LIBZNC) $(DESTDIR)$(LIBZNCDIR) ; \
diff --git a/configure b/configure
index 6dcbfe1d..c2b43620 100755
--- a/configure
+++ b/configure
@@ -3449,6 +3449,10 @@ ac_config_files="$ac_config_files znc-buildmod"
 
 ac_config_files="$ac_config_files man/Makefile"
 
+ac_config_files="$ac_config_files znc.pc"
+
+ac_config_files="$ac_config_files znc-uninstalled.pc"
+
 if test "$MODULES" = "yes"; then
 	ac_config_files="$ac_config_files modules/Makefile"
 
@@ -4065,6 +4069,8 @@ do
     "znc-config") CONFIG_FILES="$CONFIG_FILES znc-config" ;;
     "znc-buildmod") CONFIG_FILES="$CONFIG_FILES znc-buildmod" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+    "znc.pc") CONFIG_FILES="$CONFIG_FILES znc.pc" ;;
+    "znc-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES znc-uninstalled.pc" ;;
     "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
 
   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/configure.in b/configure.in
index abe90e01..d3733e9e 100644
--- a/configure.in
+++ b/configure.in
@@ -237,6 +237,8 @@ AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([znc-config])
 AC_CONFIG_FILES([znc-buildmod])
 AC_CONFIG_FILES([man/Makefile])
+AC_CONFIG_FILES([znc.pc])
+AC_CONFIG_FILES([znc-uninstalled.pc])
 if test "$MODULES" = "yes"; then
 	AC_CONFIG_FILES([modules/Makefile])
 fi
diff --git a/znc-uninstalled.pc.in b/znc-uninstalled.pc.in
new file mode 100644
index 00000000..d3e0e387
--- /dev/null
+++ b/znc-uninstalled.pc.in
@@ -0,0 +1,25 @@
+# You can access these with e.g. pkg-config --variable=moddir znc
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
+bindir=@bindir@
+datadir=@datadir@
+includedir=@includedir@
+
+cxx=@CXX@
+CPPFLAGS=@CPPFLAGS@
+MODFLAGS=@MODFLAGS@
+version=@VERSION@
+moddir=@MODDIR@
+moddatadir=@DATADIR@
+modlink=@MODLINK@
+
+# This and the following two lines should be the only differences to znc.pc.in
+srcdir=@abs_srcdir@
+INC_PATH=-I${srcdir}/
+
+Name: ZNC
+Description: An advanced IRC proxy
+Version: ${version}
+URL: http://znc.in
+Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
diff --git a/znc.pc.in b/znc.pc.in
new file mode 100644
index 00000000..47286781
--- /dev/null
+++ b/znc.pc.in
@@ -0,0 +1,23 @@
+# You can access these with e.g. pkg-config --variable=moddir znc
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
+bindir=@bindir@
+datadir=@datadir@
+includedir=@includedir@
+
+cxx=@CXX@
+CPPFLAGS=@CPPFLAGS@
+MODFLAGS=@MODFLAGS@
+version=@VERSION@
+moddir=@MODDIR@
+moddatadir=@DATADIR@
+modlink=@MODLINK@
+
+INC_PATH=-I${includedir}/znc
+
+Name: ZNC
+Description: An advanced IRC proxy
+Version: ${version}
+URL: http://znc.in
+Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}