diff --git a/Makefile.am b/Makefile.am
index 81da62948..93254e811 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
 SUBDIRS = include src tests
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libosmocore.pc libosmovty.pc
+pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc
 
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
diff --git a/configure.in b/configure.in
index 30f9d9cb2..825152d32 100644
--- a/configure.in
+++ b/configure.in
@@ -99,9 +99,11 @@ AM_CONDITIONAL(ENABLE_MSGFILE, test "x$enable_msgfile" = "x1")
 
 AC_OUTPUT(
 	libosmocore.pc
+	libosmocodec.pc
 	libosmovty.pc
 	include/osmocom/Makefile
 	include/osmocom/vty/Makefile
+	include/osmocom/codec/Makefile
 	include/osmocom/crypt/Makefile
 	include/osmocore/Makefile
 	include/osmocore/protocol/Makefile
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
index fd9074cd5..ec548fbd1 100644
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1,5 +1,5 @@
 if ENABLE_VTY
-SUBDIRS = vty crypt
+SUBDIRS = vty codec crypt
 else
-SUBDIRS = crypt
+SUBDIRS = codec crypt
 endif
diff --git a/include/osmocom/codec/Makefile.am b/include/osmocom/codec/Makefile.am
new file mode 100644
index 000000000..c21360237
--- /dev/null
+++ b/include/osmocom/codec/Makefile.am
@@ -0,0 +1,3 @@
+osmocodec_HEADERS = codec.h
+
+osmocodecdir = $(includedir)/osmocom/codec
diff --git a/libosmocodec.pc.in b/libosmocodec.pc.in
new file mode 100644
index 000000000..3030230b0
--- /dev/null
+++ b/libosmocodec.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Osmocom Codec related utilities Library
+Description: C Utility Library
+Version: @VERSION@
+Libs: -L${libdir} -losmocodec
+Cflags: -I${includedir}/
+