diff --git a/include/Makefile.am b/include/Makefile.am
index 181431b..52c6a38 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -50,6 +50,7 @@
                        osmocom/gprs/protocol/gsm_08_18.h \
                        osmocom/gsm/a5.h \
                        osmocom/gsm/abis_nm.h \
+                       osmocom/gsm/apn.h \
                        osmocom/gsm/comp128.h \
                        osmocom/gsm/comp128v23.h \
                        osmocom/gsm/gan.h \
diff --git a/include/osmocom/gsm/apn.h b/include/osmocom/gsm/apn.h
new file mode 100644
index 0000000..d8d7399
--- /dev/null
+++ b/include/osmocom/gsm/apn.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <stdint.h>
+
+/* 23.003 Section 9.1.1, excluding any terminating zero byte */
+#define APN_NI_MAXLEN	63
+
+/* 23.003 Section 9.1, excluding any terminating zero byte */
+#define APN_MAXLEN	100
+
+char *osmo_apn_qualify(unsigned int mcc, unsigned int mnc, const char *ni);
+char *osmo_apn_qualify_from_imsi(const char *imsi,
+				 const char *ni, int have_3dig_mnc);