diff --git a/Makefile.am b/Makefile.am
index 7b9ef95..8fb6e6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@
 pkgconfig_DATA = \
 	libosmo-legacy-mgcp.pc \
 	libosmo-mgcp-client.pc \
-	libosmo-mgcp.pc \
 	$(NULL)
 
 BUILT_SOURCES = $(top_srcdir)/.version
diff --git a/configure.ac b/configure.ac
index 606f404..859acd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,7 +132,6 @@
 AC_OUTPUT(
     libosmo-legacy-mgcp.pc
     libosmo-mgcp-client.pc
-    libosmo-mgcp.pc
     include/Makefile
     include/osmocom/Makefile
     include/osmocom/legacy_mgcp/Makefile
diff --git a/debian/control b/debian/control
index e96115f..383a35a 100644
--- a/debian/control
+++ b/debian/control
@@ -16,23 +16,8 @@
 Package: osmo-mgw
 Architecture: any
 Multi-Arch: foreign
-Depends: libosmo-mgcp1, ${misc:Depends}, ${shlibs:Depends}
-Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks
-
-Package: libosmo-mgcp1
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: libosmo-mgcp: Osmocom's Media Gateway server library
-
-Package: libosmo-mgcp-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libosmo-mgcp1 (= ${binary:Version}), ${misc:Depends}
-Description: libosmo-mgcp: Osmocom's Media Gateway server library
+Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks
 
 Package: libosmo-mgcp-client2
 Section: libs
diff --git a/debian/libosmo-mgcp-dev.install b/debian/libosmo-mgcp-dev.install
deleted file mode 100644
index 5be9d24..0000000
--- a/debian/libosmo-mgcp-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/osmocom/mgcp
-usr/lib/*/libosmo-mgcp.so
-usr/lib/*/libosmo-mgcp.a
-usr/lib/*/pkgconfig/libosmo-mgcp.pc
diff --git a/debian/libosmo-mgcp1.install b/debian/libosmo-mgcp1.install
deleted file mode 100644
index 7fe0a44..0000000
--- a/debian/libosmo-mgcp1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libosmo-mgcp.so.*
diff --git a/libosmo-mgcp.pc.in b/libosmo-mgcp.pc.in
deleted file mode 100644
index 63b794a..0000000
--- a/libosmo-mgcp.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Osmocom Media Gateway Control Protocol library
-Description: C Utility Library
-Version: @VERSION@
-Libs: -L${libdir} -losmo-mgcp
-Cflags: -I${includedir}/
diff --git a/src/libosmo-mgcp/Makefile.am b/src/libosmo-mgcp/Makefile.am
index fbb1a2e..a98c391 100644
--- a/src/libosmo-mgcp/Makefile.am
+++ b/src/libosmo-mgcp/Makefile.am
@@ -21,19 +21,15 @@
 	$(COVERAGE_LDFLAGS) \
 	$(NULL)
 
-# This is not at all related to the release version, but a range of supported
-# API versions. Read TODO_RELEASE in the source tree's root!
-MGCP_LIBVERSION=1:0:0
-
-lib_LTLIBRARIES = \
-	libosmo-mgcp.la \
+noinst_LIBRARIES = \
+	libosmo-mgcp.a \
 	$(NULL)
 
 noinst_HEADERS = \
 	g711common.h \
 	$(NULL)
 
-libosmo_mgcp_la_SOURCES = \
+libosmo_mgcp_a_SOURCES = \
 	mgcp_protocol.c \
 	mgcp_network.c \
 	mgcp_vty.c \
@@ -44,5 +40,3 @@
 	mgcp_stat.c \
 	mgcp_endp.c \
 	$(NULL)
-
-libosmo_mgcp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(MGCP_LIBVERSION)
diff --git a/src/osmo-mgw/Makefile.am b/src/osmo-mgw/Makefile.am
index 3cbddf5..a076d4c 100644
--- a/src/osmo-mgw/Makefile.am
+++ b/src/osmo-mgw/Makefile.am
@@ -8,6 +8,7 @@
 	-Wall \
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMONETIF_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
@@ -21,8 +22,9 @@
 	$(NULL)
 
 osmo_mgw_LDADD = \
-	$(top_builddir)/src/libosmo-mgcp/libosmo-mgcp.la \
+	$(top_builddir)/src/libosmo-mgcp/libosmo-mgcp.a \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMONETIF_LIBS) \
 	$(NULL)
diff --git a/tests/mgcp/Makefile.am b/tests/mgcp/Makefile.am
index caccb9f..df2b7c8 100644
--- a/tests/mgcp/Makefile.am
+++ b/tests/mgcp/Makefile.am
@@ -8,6 +8,8 @@
 	-Wall \
 	-ggdb3 \
 	$(LIBOSMOCORE_CFLAGS) \
+	$(LIBOSMOVTY_CFLAGS) \
+	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMONETIF_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
@@ -29,9 +31,10 @@
 	$(NULL)
 
 mgcp_test_LDADD = \
-	$(top_builddir)/src/libosmo-mgcp/libosmo-mgcp.la \
+	$(top_builddir)/src/libosmo-mgcp/libosmo-mgcp.a \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
 	$(LIBRARY_DL) \
 	$(LIBOSMONETIF_LIBS) \
 	-lm  \