diff --git a/src/osmo-bts-sysmo/utils.c b/src/osmo-bts-sysmo/utils.c
index b50b5cdba..4b29afec7 100644
--- a/src/osmo-bts-sysmo/utils.c
+++ b/src/osmo-bts-sysmo/utils.c
@@ -248,12 +248,14 @@ int check_oml_msg(struct msgb *msg)
 			sizeof(ipaccess_magic));
 
 		if (strncmp(ipaccess_magic, label_id,
-			    sizeof(ipaccess_magic)) == 0)
+			    sizeof(ipaccess_magic)) == 0) {
 			msg->l3h = msg->l3h + sizeof(ipaccess_magic) + 1;
-		else if (strncmp(osmocom_magic, label_id,
-				 sizeof(osmocom_magic)) == 0)
+			return OML_MSG_TYPE_IPA;
+		} else if (strncmp(osmocom_magic, label_id,
+				 sizeof(osmocom_magic)) == 0) {
 			msg->l3h = msg->l3h + sizeof(osmocom_magic) + 1;
-		else {
+			return OML_MSG_TYPE_OSMO;
+		} else {
 			msg->l3h = NULL;
 			LOGP(DL1C, LOGL_ERROR,
 			     "Manuf Label Unknown %s\n", label_id);
@@ -261,7 +263,7 @@ int check_oml_msg(struct msgb *msg)
 		}
 	}
 
-	return 0;
+	return OML_MSG_TYPE_ETSI;
 }
 
 int check_ipa_header(struct msgb *msg)
diff --git a/src/osmo-bts-sysmo/utils.h b/src/osmo-bts-sysmo/utils.h
index 4f2293aac..b0c624f75 100644
--- a/src/osmo-bts-sysmo/utils.h
+++ b/src/osmo-bts-sysmo/utils.h
@@ -21,6 +21,12 @@ enum manuf_type_id {
 	OSMOCOM_MANUF_ID,
 };
 
+enum oml_message_type {
+	OML_MSG_TYPE_ETSI,
+	OML_MSG_TYPE_IPA,
+	OML_MSG_TYPE_OSMO,
+};
+
 static const char osmocom_magic[] = "org.osmocom";
 static const char ipaccess_magic[] = "com.ipaccess";