diff --git a/openbsc/src/libbsc/Makefile.am b/openbsc/src/libbsc/Makefile.am
index 3588b66..8fa5c7c 100644
--- a/openbsc/src/libbsc/Makefile.am
+++ b/openbsc/src/libbsc/Makefile.am
@@ -15,7 +15,6 @@
 			bts_unknown.c \
 			bts_sysmobts.c \
 			chan_alloc.c \
-			gsm_subscriber_base.c \
 			handover_decision.c handover_logic.c meas_rep.c \
 			rest_octets.c system_information.c \
 			e1_config.c \
diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am
index e41326f..75f40ee 100644
--- a/openbsc/src/libcommon/Makefile.am
+++ b/openbsc/src/libcommon/Makefile.am
@@ -4,4 +4,6 @@
 
 noinst_LIBRARIES = libcommon.a
 
-libcommon_a_SOURCES = bsc_version.c common_vty.c debug.c gsm_data.c gsm_data_shared.c socket.c talloc_ctx.c
+libcommon_a_SOURCES = bsc_version.c common_vty.c debug.c gsm_data.c \
+		      gsm_data_shared.c socket.c talloc_ctx.c \
+		      gsm_subscriber_base.c
diff --git a/openbsc/src/libbsc/gsm_subscriber_base.c b/openbsc/src/libcommon/gsm_subscriber_base.c
similarity index 100%
rename from openbsc/src/libbsc/gsm_subscriber_base.c
rename to openbsc/src/libcommon/gsm_subscriber_base.c
diff --git a/openbsc/src/osmo-bsc_nat/Makefile.am b/openbsc/src/osmo-bsc_nat/Makefile.am
index a9e81fc..ca103a4 100644
--- a/openbsc/src/osmo-bsc_nat/Makefile.am
+++ b/openbsc/src/osmo-bsc_nat/Makefile.am
@@ -8,10 +8,11 @@
 osmo_bsc_nat_SOURCES = bsc_filter.c bsc_mgcp_utils.c bsc_nat.c bsc_nat_utils.c \
 		  bsc_nat_vty.c bsc_sccp.c bsc_ussd.c bsc_nat_ctrl.c \
 		  bsc_nat_rewrite.c bsc_nat_filter.c bsc_nat_rewrite_trie.c
-osmo_bsc_nat_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
+osmo_bsc_nat_LDADD = \
 		$(top_builddir)/src/libmgcp/libmgcp.a \
 		$(top_builddir)/src/libbsc/libbsc.a \
 		$(top_builddir)/src/libtrau/libtrau.a \
+		$(top_builddir)/src/libcommon/libcommon.a \
 		-lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOCORE_LIBS) \
 		$(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOCTRL_LIBS) \
 		$(LIBOSMOABIS_LIBS) $(LIBOSMONETIF_LIBS)
diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am
index fd1f7ae..acaa937 100644
--- a/openbsc/src/utils/Makefile.am
+++ b/openbsc/src/utils/Makefile.am
@@ -9,9 +9,9 @@
 endif
 
 bs11_config_SOURCES = bs11_config.c
-bs11_config_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
-		    $(top_builddir)/src/libbsc/libbsc.a \
+bs11_config_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
 		    $(top_builddir)/src/libtrau/libtrau.a \
+		    $(top_builddir)/src/libcommon/libcommon.a \
 		    $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOABIS_LIBS)
 
 isdnsync_SOURCES = isdnsync.c