diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a96f604
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,30 @@
+.*swp
+*.la
+*.lo
+*.o
+*.tar.gz
+.deps/
+.dirstamp
+.libs/
+/aclocal.m4
+/autom4te.cache
+/build-aux
+/config.*
+/configure
+/libtool
+/stamp-h1
+Makefile
+Makefile.in
+TAGS
+protobuf-c/libprotobuf-c.pc
+protobuf-c-rpc/libprotobuf-c-rpc.pc
+protoc-c/protoc-c
+t/generated-code/test-generated-code
+t/generated-code2/cxx-generate-packed-data
+t/generated-code2/test-full-cxx-output.inc
+t/generated-code2/test-generated-code2
+protobuf-c-rpc/t/test-rpc
+*.pb-c.c
+*.pb-c.h
+*.pb.cc
+*.pb.h
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..587488a
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,225 @@
+bin_PROGRAMS =
+check_PROGRAMS =
+noinst_PROGRAMS =
+lib_LTLIBRARIES =
+nobase_include_HEADERS =
+pkgconfig_DATA =
+BUILT_SOURCES =
+TESTS =
+CLEANFILES =
+DISTCLEANFILES =
+EXTRA_DIST =
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+AM_CPPFLAGS = \
+	-include $(top_builddir)/config.h \
+	-I${top_srcdir}/protobuf-c
+AM_CFLAGS = ${my_CFLAGS}
+AM_LDFLAGS =
+
+#
+# libprotobuf-c
+#
+
+LIBPROTOBUF_C_CURRENT=0
+LIBPROTOBUF_C_REVISION=0
+LIBPROTOBUF_C_AGE=0
+
+lib_LTLIBRARIES += \
+	protobuf-c/libprotobuf-c.la
+
+nobase_include_HEADERS += \
+	protobuf-c/protobuf-c.h \
+	protobuf-c/protobuf-c-private.h
+
+protobuf_c_libprotobuf_c_la_SOURCES = \
+	protobuf-c/protobuf-c.c \
+	protobuf-c/protobuf-c.h \
+	protobuf-c/protobuf-c-private.h
+
+protobuf_c_libprotobuf_c_la_LDFLAGS = $(AM_LDFLAGS) \
+	-version-info $(LIBPROTOBUF_C_CURRENT):$(LIBPROTOBUF_C_REVISION):$(LIBPROTOBUF_C_AGE) \
+	-export-symbols-regex "^(protobuf_c_[a-z].*)" \
+	-no-undefined
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/libprotobuf-c.la
+	rm -f $(DESTDIR)$(libdir)/libprotobuf-c-rpc.la
+
+pkgconfig_DATA += protobuf-c/libprotobuf-c.pc
+CLEANFILES += protobuf-c/libprotobuf-c.pc
+EXTRA_DIST += protobuf-c/libprotobuf-c.pc.in
+
+#
+# libprotobuf-c-rpc
+#
+
+if BUILD_RPC
+
+LIBPROTOBUF_C_RPC_CURRENT=0
+LIBPROTOBUF_C_RPC_REVISION=0
+LIBPROTOBUF_C_RPC_AGE=0
+
+lib_LTLIBRARIES += \
+	protobuf-c-rpc/libprotobuf-c-rpc.la
+
+nobase_include_HEADERS += \
+	protobuf-c-rpc/protobuf-c-data-buffer.h \
+	protobuf-c-rpc/protobuf-c-dispatch.h \
+	protobuf-c-rpc/protobuf-c-rpc.h
+
+protobuf_c_rpc_libprotobuf_c_rpc_la_SOURCES = \
+	protobuf-c-rpc/protobuf-c-data-buffer.c \
+	protobuf-c-rpc/protobuf-c-dispatch.c \
+	protobuf-c-rpc/protobuf-c-rpc.c
+
+protobuf_c_rpc_libprotobuf_c_rpc_la_LDFLAGS = $(AM_LDFLAGS) \
+	-version-info $(LIBPROTOBUF_C_RPC_CURRENT):$(LIBPROTOBUF_C_RPC_REVISION):$(LIBPROTOBUF_C_RPC_AGE) \
+	-export-symbols-regex "^(protobuf_c_[a-z].*)" \
+	-no-undefined
+
+pkgconfig_DATA += protobuf-c-rpc/libprotobuf-c-rpc.pc
+CLEANFILES += protobuf-c-rpc/libprotobuf-c-rpc.pc
+EXTRA_DIST += protobuf-c-rpc/libprotobuf-c-rpc.pc.in
+
+endif
+
+#
+# protoc-c
+#
+
+if BUILD_PROTOC_C
+
+bin_PROGRAMS += protoc-c/protoc-c
+protoc_c_protoc_c_SOURCES = \
+	protoc-c/c_bytes_field.cc \
+	protoc-c/c_bytes_field.h \
+	protoc-c/c_enum.cc \
+	protoc-c/c_enum.h \
+	protoc-c/c_enum_field.cc \
+	protoc-c/c_enum_field.h \
+	protoc-c/c_extension.cc \
+	protoc-c/c_extension.h \
+	protoc-c/c_field.cc \
+	protoc-c/c_field.h \
+	protoc-c/c_file.cc \
+	protoc-c/c_file.h \
+	protoc-c/c_generator.cc \
+	protoc-c/c_generator.h \
+	protoc-c/c_helpers.cc \
+	protoc-c/c_helpers.h \
+	protoc-c/c_message.cc \
+	protoc-c/c_message.h \
+	protoc-c/c_message_field.cc \
+	protoc-c/c_message_field.h \
+	protoc-c/c_primitive_field.cc \
+	protoc-c/c_primitive_field.h \
+	protoc-c/c_service.cc \
+	protoc-c/c_service.h \
+	protoc-c/c_string_field.cc \
+	protoc-c/c_string_field.h \
+	protoc-c/main.cc
+protoc_c_protoc_c_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(protobuf_CFLAGS)
+protoc_c_protoc_c_LDADD = \
+	$(protobuf_LIBS) \
+	-lprotoc
+
+endif
+
+#
+# protobuf-c tests
+#
+
+if BUILD_PROTOC_C
+
+check_PROGRAMS += \
+	t/generated-code/test-generated-code \
+	t/generated-code2/test-generated-code2
+
+TESTS += \
+	t/generated-code/test-generated-code \
+	t/generated-code2/test-generated-code2
+
+t_generated_code_test_generated_code_SOURCES = \
+	t/generated-code/test-generated-code.c \
+	t/test.pb-c.c
+t_generated_code_test_generated_code_LDADD = \
+	protobuf-c/libprotobuf-c.la
+
+t_generated_code2_test_generated_code2_SOURCES = \
+	t/generated-code2/test-generated-code2.c \
+	t/test-full.pb-c.c
+t_generated_code2_test_generated_code2_LDADD = \
+	protobuf-c/libprotobuf-c.la
+
+noinst_PROGRAMS += \
+	t/generated-code2/cxx-generate-packed-data
+
+t_generated_code2_cxx_generate_packed_data_SOURCES = \
+	t/generated-code2/cxx-generate-packed-data.cc \
+	t/test-full.pb.cc
+t/generated-code2/cxx-generate-packed-data.$(OBJEXT): t/test-full.pb.h
+t_generated_code2_cxx_generate_packed_data_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(protobuf_CFLAGS)
+t_generated_code2_cxx_generate_packed_data_LDADD = \
+	$(protobuf_LIBS)
+
+t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-c$(EXEEXT) $(top_srcdir)/t/test.proto
+	$(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto
+
+t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-c$(EXEEXT) $(top_srcdir)/t/test-full.proto
+	$(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
+
+t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto
+	$(AM_V_GEN)@PROTOC@ --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
+
+t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT)
+	$(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc
+
+BUILT_SOURCES += \
+	t/test.pb-c.c t/test.pb-c.h \
+	t/test-full.pb-c.c t/test-full.pb-c.h \
+	t/test-full.pb.cc t/test-full.pb.h \
+	t/generated-code2/test-full-cxx-output.inc
+
+EXTRA_DIST += \
+	t/test.proto \
+	t/test-full.proto \
+	t/generated-code2/common-test-arrays.h
+
+endif
+
+#
+# protobuf-c-rpc tests
+#
+
+if BUILD_PROTOC_C
+if BUILD_RPC
+
+check_PROGRAMS += \
+	protobuf-c-rpc/t/test-rpc
+
+TESTS += \
+	protobuf-c-rpc/t/test-rpc
+
+protobuf_c_rpc_t_test_rpc_SOURCES = \
+	protobuf-c-rpc/t/test-rpc.c \
+	t/test.pb-c.c
+protobuf_c_rpc_t_test_rpc_LDADD = \
+	protobuf-c/libprotobuf-c.la \
+	protobuf-c-rpc/libprotobuf-c-rpc.la
+
+endif
+endif
+
+#
+#
+#
+
+CLEANFILES += $(BUILT_SOURCES)
+
+dist-hook:
+	rm -vf `find $(top_distdir) -name '*.pb-c.[ch]' -o -name '*.pb.cc' -o -name '*.pb.h'`
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..94c673d
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec autoreconf -fvi
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..8286b39
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,82 @@
+AC_PREREQ(2.60)
+AC_INIT([protobuf-c], [0.16])
+AC_CONFIG_SRCDIR([protobuf-c/protobuf-c.c])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules subdir-objects])
+AC_PROG_CC_STDC
+AC_PROG_CXX
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
+AC_CONFIG_MACRO_DIR([m4])
+AM_SILENT_RULES([yes])
+LT_INIT
+
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_FILES([Makefile protobuf-c/libprotobuf-c.pc protobuf-c-rpc/libprotobuf-c-rpc.pc])
+
+AC_CHECK_HEADERS(alloca.h)
+AC_CHECK_HEADERS(inttypes.h)
+AC_CHECK_HEADERS(io.h)
+AC_CHECK_HEADERS(malloc.h)
+AC_CHECK_HEADERS(sys/poll.h)
+AC_CHECK_HEADERS(sys/select.h)
+AC_CHECK_HEADERS(sys/uio.h)
+AC_CHECK_HEADERS(unistd.h)
+AC_CHECK_HEADERS(winsock.h)
+
+AC_PATH_PROG(PROTOC, protoc)
+
+PKG_PROG_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+    # Horrible hack for systems where the pkg-config install directory is simply wrong!
+    if $PKG_CONFIG --variable=pc_path pkg-config 2>/dev/null | grep -q /libdata/; then
+        PKG_INSTALLDIR(['${prefix}/libdata/pkgconfig'])
+    else
+        PKG_INSTALLDIR
+    fi
+else
+    AC_MSG_ERROR([pkg-config is required!])
+fi
+
+AC_ARG_ENABLE(
+    [protoc],
+    AS_HELP_STRING([--disable-protoc], [Disable building the protobuf-c compiler])
+)
+AS_IF(
+    [test "x$enable_protoc" != "xno"],
+    [
+        PKG_CHECK_MODULES([protobuf], [protobuf])
+        AC_LANG_PUSH([C++])
+    ]
+)
+AM_CONDITIONAL([BUILD_PROTOC_C], [test "x$enable_protoc" != "xno"])
+
+AC_ARG_ENABLE(
+    [rpc],
+    AS_HELP_STRING([--enable-rpc], [Enable building the protobuf-c rpc library])
+)
+AM_CONDITIONAL([BUILD_RPC], [test "x$enable_rpc" = "xyes"])
+
+AC_C_BIGENDIAN(
+    [AC_DEFINE([IS_LITTLE_ENDIAN], [0], [Define to 1 if system is little endian])],
+    [AC_DEFINE([IS_LITTLE_ENDIAN], [1], [Define to 1 if system is little endian])],
+    [AC_MSG_FAILURE([unable to determine endianness])]
+)
+
+AC_OUTPUT
+AC_MSG_RESULT([
+    $PACKAGE $VERSION
+
+        compiler:               ${CC}
+        cflags:                 ${CFLAGS}
+        ldflags:                ${LDFLAGS}
+        libs:                   ${LIBS}
+
+        prefix:                 ${prefix}
+        sysconfdir:             ${sysconfdir}
+        libdir:                 ${libdir}
+        includedir:             ${includedir}
+        pkgconfigdir:           ${pkgconfigdir}
+
+        bigendian:              ${ac_cv_c_bigendian}
+])
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..38066dd
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,5 @@
+libtool.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
diff --git a/m4/pkg.m4 b/m4/pkg.m4
new file mode 100644
index 0000000..c5b26b5
--- /dev/null
+++ b/m4/pkg.m4
@@ -0,0 +1,214 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
diff --git a/protobuf-c-rpc/libprotobuf-c-rpc.pc.in b/protobuf-c-rpc/libprotobuf-c-rpc.pc.in
new file mode 100644
index 0000000..0e1a9f2
--- /dev/null
+++ b/protobuf-c-rpc/libprotobuf-c-rpc.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libprotobuf-c-rpc
+Description: Protocol Buffers C RPC library
+Version: @VERSION@
+Libs: -L${libdir} -lprotobuf-c-rpc
+Libs.private:
+Cflags: -I${includedir}
diff --git a/protobuf-c/libprotobuf-c.pc.in b/protobuf-c/libprotobuf-c.pc.in
new file mode 100644
index 0000000..b471b8b
--- /dev/null
+++ b/protobuf-c/libprotobuf-c.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libprotobuf-c
+Description: Protocol Buffers C library
+Version: @VERSION@
+Libs: -L${libdir} -lprotobuf-c
+Libs.private:
+Cflags: -I${includedir}