diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am
index 454b970..d834896 100644
--- a/src/libmsc/Makefile.am
+++ b/src/libmsc/Makefile.am
@@ -28,11 +28,12 @@
 	$(NULL)
 
 libmsc_a_SOURCES = \
-	a_iface.c \
-	a_iface_bssap.c \
-	a_reset.c \
+	call_leg.c \
+	cell_id_list.c \
+	sccp_ran.c \
 	msc_vty.c \
 	db.c \
+	e_link.c \
 	gsm_04_08.c \
 	gsm_04_08_cc.c \
 	gsm_04_11.c \
@@ -40,31 +41,42 @@
 	gsm_04_14.c \
 	gsm_04_80.c \
 	gsm_09_11.c \
-	gsm_subscriber.c \
+	gsup_client_mux.c \
 	mncc.c \
 	mncc_builtin.c \
 	mncc_sock.c \
-	msc_ifaces.c \
-	msc_mgcp.c \
+	mncc_call.c \
+	msub.c \
+	msc_a.c \
+	msc_a_remote.c \
+	msc_i.c \
+	msc_i_remote.c \
+	msc_t.c \
+	msc_t_remote.c \
+	msc_ho.c \
+	neighbor_ident.c \
+	neighbor_ident_vty.c \
+	paging.c \
 	ran_conn.c \
+	ran_infra.c \
+	ran_msg.c \
+	ran_msg_a.c \
+	ran_peer.c \
 	rrlp.c \
+	rtp_stream.c \
 	silent_call.c \
 	sms_queue.c \
 	transaction.c \
-	osmo_msc.c \
+	msc_net_init.c \
 	ctrl_commands.c \
 	sgs_iface.c \
 	sgs_server.c \
 	sgs_vty.c \
 	$(NULL)
+
 if BUILD_IU
 libmsc_a_SOURCES += \
-	iucs.c \
-	iucs_ranap.c \
-	$(NULL)
-else
-libmsc_a_SOURCES += \
-	iu_dummy.c \
+	ran_msg_iu.c \
 	$(NULL)
 endif