diff --git a/.gitignore b/.gitignore
index 3626a5a62..010f151ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,8 @@ debian/*.log
 .deps
 Makefile
 Makefile.in
-bscconfig.h
-bscconfig.h.in
+config.h
+config.h.in
 *.*~
 *.sw?
 .libs
diff --git a/configure.ac b/configure.ac
index 2c335d75e..5985cf8cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,7 +230,7 @@ AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 
 dnl Generate the output
-AM_CONFIG_HEADER(bscconfig.h)
+AM_CONFIG_HEADER(config.h)
 
 AC_OUTPUT(
     include/Makefile
diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h
index c92b25162..aadb8a75a 100644
--- a/include/osmocom/sgsn/sgsn.h
+++ b/include/osmocom/sgsn/sgsn.h
@@ -14,7 +14,7 @@
 #include <osmocom/gsupclient/gsup_client.h>
 #include <osmocom/sgsn/common.h>
 
-#include "../../bscconfig.h"
+#include "../../config.h"
 
 #if BUILD_IU
 #include <osmocom/ranap/iu_client.h>
diff --git a/src/gtphub/gtphub_main.c b/src/gtphub/gtphub_main.c
index 0f389ab6e..4d1e9cfd2 100644
--- a/src/gtphub/gtphub_main.c
+++ b/src/gtphub/gtphub_main.c
@@ -44,7 +44,7 @@
 #include <osmocom/gtphub/gtphub.h>
 #include <osmocom/sgsn/vty.h>
 
-#include "../../bscconfig.h"
+#include "../../config.h"
 
 #if BUILD_IU
 #include <osmocom/sigtran/osmo_ss7.h>
diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index 2630db975..2f15c92d0 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -30,7 +30,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "bscconfig.h"
+#include "config.h"
 
 #include <osmocom/core/msgb.h>
 #include <osmocom/gsm/tlv.h>
diff --git a/src/sgsn/gprs_ns.c b/src/sgsn/gprs_ns.c
index b67691791..e2ff931af 100644
--- a/src/sgsn/gprs_ns.c
+++ b/src/sgsn/gprs_ns.c
@@ -29,7 +29,7 @@
 #include <osmocom/gprs/gprs_bssgp_bss.h>
 #include <osmocom/sgsn/gprs_llc.h>
 
-#include "bscconfig.h"
+#include "config.h"
 
 #include <osmocom/sgsn/gprs_sgsn.h>
 #include <osmocom/sgsn/debug.h>
diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c
index 245de4bdb..d3d958d74 100644
--- a/src/sgsn/gprs_ranap.c
+++ b/src/sgsn/gprs_ranap.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "bscconfig.h"
+#include "config.h"
 #include <gtp.h>
 
 #include <osmocom/core/rate_ctr.h>
diff --git a/src/sgsn/gprs_sgsn.c b/src/sgsn/gprs_sgsn.c
index 40efd4aff..55e1cb205 100644
--- a/src/sgsn/gprs_sgsn.c
+++ b/src/sgsn/gprs_sgsn.c
@@ -58,7 +58,7 @@
 
 #include <time.h>
 
-#include "../../bscconfig.h"
+#include "../../config.h"
 
 #define GPRS_LLME_CHECK_TICK 30
 
diff --git a/src/sgsn/gprs_sm.c b/src/sgsn/gprs_sm.c
index 9a66e0a69..3a5ba3b99 100644
--- a/src/sgsn/gprs_sm.c
+++ b/src/sgsn/gprs_sm.c
@@ -26,7 +26,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include "bscconfig.h"
+#include "config.h"
 
 #include <osmocom/core/rate_ctr.h>
 #include <osmocom/core/tdef.h>
diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c
index 19a0f569a..e2d567028 100644
--- a/src/sgsn/sgsn_libgtp.c
+++ b/src/sgsn/sgsn_libgtp.c
@@ -34,7 +34,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "bscconfig.h"
+#include "config.h"
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/select.h>
diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c
index 72533489f..d9d454c3a 100644
--- a/src/sgsn/sgsn_main.c
+++ b/src/sgsn/sgsn_main.c
@@ -70,7 +70,7 @@
 #include <gtp.h>
 #include <osmocom/sgsn/sgsn_rim.h>
 
-#include "../../bscconfig.h"
+#include "../../config.h"
 
 #if BUILD_IU
 #include <osmocom/sigtran/osmo_ss7.h>
diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c
index d8ea42008..fa62561e6 100644
--- a/src/sgsn/sgsn_vty.c
+++ b/src/sgsn/sgsn_vty.c
@@ -58,7 +58,7 @@
 #include <pdp.h>
 #include <gtp.h>
 
-#include "../../bscconfig.h"
+#include "../../config.h"
 
 #ifdef BUILD_IU
 #include <osmocom/ranap/iu_client.h>