diff --git a/src/Makefile b/src/Makefile
index 01cd87e..1ceab0b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,4 @@
 ASN1_ROOT=../asn1/
-ASN1_DIR=$(ASN1_ROOT)/hnbap
 ASN1_FILES=HNBAP-CommonDataTypes.asn
 
 ASN1TOSTRUCT:=$(ASN1_ROOT)/utils/asn1tostruct.py
@@ -11,7 +10,15 @@
 all: hnbgw
 
 .PHONY: hnbap_encoder.c
-hnbap_encoder.c: $(ASN1_DIR)/HNBAP-PDU-Contents.asn
+hnbap_encoder.c: $(ASN1_ROOT)/hnbap/HNBAP-PDU-Contents.asn
+	$(ASN1TOSTRUCT) -f $<
+
+.PHONY: rua_encoder.c
+rua_encoder.c: $(ASN1_ROOT)/rua/RUA-PDU-Contents.asn
+	$(ASN1TOSTRUCT) -f $<
+
+.PHONY: ranap_encoder.c
+ranap_encoder.c: $(ASN1_ROOT)/ranap/RANAP-PDU-Contents.asn
 	$(ASN1TOSTRUCT) -f $<
 
 asn1c/libosmo-asn1-hnbap.a: