diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index e18c35e..cc5f0ec 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -38,7 +38,7 @@
 
 isdnsync_SOURCES = isdnsync.c
 
-bsc_mgcp_SOURCES = bsc_mgcp.c msgb.c talloc.c debug.c select.c timer.c telnet_interface.c
+bsc_mgcp_SOURCES = mgcp/bsc_mgcp.c msgb.c talloc.c debug.c select.c timer.c telnet_interface.c
 bsc_mgcp_LDADD = libvty.a
 
 ipaccess_proxy_SOURCES = ipaccess/ipaccess-proxy.c msgb.c select.c talloc.c debug.c timer.c
diff --git a/openbsc/src/bsc_mgcp.c b/openbsc/src/mgcp/bsc_mgcp.c
similarity index 100%
rename from openbsc/src/bsc_mgcp.c
rename to openbsc/src/mgcp/bsc_mgcp.c