diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am
new file mode 100644
index 0000000..ec11926
--- /dev/null
+++ b/src/hnbap/Makefile.am
@@ -0,0 +1,240 @@
+ASN_MODULE_FILES=	\
+	Criticality.c	\
+	Presence.c	\
+	PrivateIE-ID.c	\
+	ProcedureCode.c	\
+	ProtocolIE-ID.c	\
+	TriggeringMessage.c	\
+	IE-Extensions.c	\
+	Access-stratum-release-indicator.c	\
+	AccessResult.c	\
+	AltitudeAndDirection.c	\
+	BackoffTimer.c	\
+	BindingID.c	\
+	Cause.c	\
+	CauseRadioNetwork.c	\
+	CauseTransport.c	\
+	CauseProtocol.c	\
+	CauseMisc.c	\
+	CellIdentity.c	\
+	CELL-FACHMobilitySupport.c	\
+	Context-ID.c	\
+	CriticalityDiagnostics.c	\
+	CriticalityDiagnostics-IE-List.c	\
+	CSG-ID.c	\
+	CSG-Capability.c	\
+	CSGMembershipStatus.c	\
+	CGI.c	\
+	CI.c	\
+	CN-DomainIndicator.c	\
+	ESN.c	\
+	GeographicalLocation.c	\
+	GeographicalCoordinates.c	\
+	GTP-TEI.c	\
+	HNBCapacity.c	\
+	HNB-Cell-Access-Mode.c	\
+	HNB-Cell-Identifier.c	\
+	HNB-GWResponse.c	\
+	HNB-RNL-Identity.c	\
+	HNBConfigInfo.c	\
+	ConfigurationInformation.c	\
+	HNBConfigurationInformationProvided.c	\
+	HNBConfigurationInformationMissing.c	\
+	HNB-Location-Information.c	\
+	HNB-Identity.c	\
+	HNB-Identity-Info.c	\
+	IMEI.c	\
+	IMSI.c	\
+	IMSIDS41.c	\
+	IMSIESN.c	\
+	IP-Address.c	\
+	Ipv4Address.c	\
+	Ipv6Address.c	\
+	Iurh-Signalling-TNL-AddressList.c	\
+	LAC.c	\
+	LAI.c	\
+	MacroCoverageInformation.c	\
+	MacroCellID.c	\
+	MuxPortNumber.c	\
+	NeighbourCellIdentityList.c	\
+	NeighbourIdentity.c	\
+	NeighbourInfoList.c	\
+	AdditionalNeighbourInfoList.c	\
+	NeighbourInfoRequestList.c	\
+	NeighbourInfoRequestItem.c	\
+	PLMNidentity.c	\
+	PSC.c	\
+	PTMSI.c	\
+	PTMSIRAI.c	\
+	RAB-ID.c	\
+	RABList.c	\
+	RABListItem.c	\
+	RAC.c	\
+	RAI.c	\
+	Registration-Cause.c	\
+	RNC-ID.c	\
+	SAC.c	\
+	S-RNTIPrefix.c	\
+	TMSILAI.c	\
+	TMSIDS41.c	\
+	TransportInfo.c	\
+	TransportLayerAddress.c	\
+	Tunnel-Information.c	\
+	TypeOfError.c	\
+	UDP-Port-Number.c	\
+	UE-Capabilities.c	\
+	UTRANCellID.c	\
+	UE-Identity.c	\
+	Update-cause.c	\
+	URAIdentityList.c	\
+	URAIdentity.c	\
+	U-RNTI.c	\
+	UnknownU-RNTIIndication.c	\
+	HNBAP-PDU.c	\
+	InitiatingMessage.c	\
+	SuccessfulOutcome.c	\
+	UnsuccessfulOutcome.c	\
+	HNBRegisterRequest.c	\
+	HNBRegisterAccept.c	\
+	HNBRegisterReject.c	\
+	UERegisterRequest.c	\
+	UERegisterAccept.c	\
+	UERegisterReject.c	\
+	UEDe-Register.c	\
+	HNBDe-Register.c	\
+	ErrorIndication.c	\
+	CSGMembershipUpdate.c	\
+	TNLUpdateRequest.c	\
+	TNLUpdateResponse.c	\
+	TNLUpdateFailure.c	\
+	HNBConfigTransferRequest.c	\
+	HNBConfigTransferResponse.c	\
+	RelocationComplete.c	\
+	U-RNTIQueryRequest.c	\
+	U-RNTIQueryResponse.c	\
+	PrivateMessage.c	\
+	IE.c
+
+ASN_MODULE_INC=	\
+	Criticality.h	\
+	Presence.h	\
+	PrivateIE-ID.h	\
+	ProcedureCode.h	\
+	ProtocolIE-ID.h	\
+	TriggeringMessage.h	\
+	IE-Extensions.h	\
+	Access-stratum-release-indicator.h	\
+	AccessResult.h	\
+	AltitudeAndDirection.h	\
+	BackoffTimer.h	\
+	BindingID.h	\
+	Cause.h	\
+	CauseRadioNetwork.h	\
+	CauseTransport.h	\
+	CauseProtocol.h	\
+	CauseMisc.h	\
+	CellIdentity.h	\
+	CELL-FACHMobilitySupport.h	\
+	Context-ID.h	\
+	CriticalityDiagnostics.h	\
+	CriticalityDiagnostics-IE-List.h	\
+	CSG-ID.h	\
+	CSG-Capability.h	\
+	CSGMembershipStatus.h	\
+	CGI.h	\
+	CI.h	\
+	CN-DomainIndicator.h	\
+	ESN.h	\
+	GeographicalLocation.h	\
+	GeographicalCoordinates.h	\
+	GTP-TEI.h	\
+	HNBCapacity.h	\
+	HNB-Cell-Access-Mode.h	\
+	HNB-Cell-Identifier.h	\
+	HNB-GWResponse.h	\
+	HNB-RNL-Identity.h	\
+	HNBConfigInfo.h	\
+	ConfigurationInformation.h	\
+	HNBConfigurationInformationProvided.h	\
+	HNBConfigurationInformationMissing.h	\
+	HNB-Location-Information.h	\
+	HNB-Identity.h	\
+	HNB-Identity-Info.h	\
+	IMEI.h	\
+	IMSI.h	\
+	IMSIDS41.h	\
+	IMSIESN.h	\
+	IP-Address.h	\
+	Ipv4Address.h	\
+	Ipv6Address.h	\
+	Iurh-Signalling-TNL-AddressList.h	\
+	LAC.h	\
+	LAI.h	\
+	MacroCoverageInformation.h	\
+	MacroCellID.h	\
+	MuxPortNumber.h	\
+	NeighbourCellIdentityList.h	\
+	NeighbourIdentity.h	\
+	NeighbourInfoList.h	\
+	AdditionalNeighbourInfoList.h	\
+	NeighbourInfoRequestList.h	\
+	NeighbourInfoRequestItem.h	\
+	PLMNidentity.h	\
+	PSC.h	\
+	PTMSI.h	\
+	PTMSIRAI.h	\
+	RAB-ID.h	\
+	RABList.h	\
+	RABListItem.h	\
+	RAC.h	\
+	RAI.h	\
+	Registration-Cause.h	\
+	RNC-ID.h	\
+	SAC.h	\
+	S-RNTIPrefix.h	\
+	TMSILAI.h	\
+	TMSIDS41.h	\
+	TransportInfo.h	\
+	TransportLayerAddress.h	\
+	Tunnel-Information.h	\
+	TypeOfError.h	\
+	UDP-Port-Number.h	\
+	UE-Capabilities.h	\
+	UTRANCellID.h	\
+	UE-Identity.h	\
+	Update-cause.h	\
+	URAIdentityList.h	\
+	URAIdentity.h	\
+	U-RNTI.h	\
+	UnknownU-RNTIIndication.h	\
+	HNBAP-PDU.h	\
+	InitiatingMessage.h	\
+	SuccessfulOutcome.h	\
+	UnsuccessfulOutcome.h	\
+	HNBRegisterRequest.h	\
+	HNBRegisterAccept.h	\
+	HNBRegisterReject.h	\
+	UERegisterRequest.h	\
+	UERegisterAccept.h	\
+	UERegisterReject.h	\
+	UEDe-Register.h	\
+	HNBDe-Register.h	\
+	ErrorIndication.h	\
+	CSGMembershipUpdate.h	\
+	TNLUpdateRequest.h	\
+	TNLUpdateResponse.h	\
+	TNLUpdateFailure.h	\
+	HNBConfigTransferRequest.h	\
+	HNBConfigTransferResponse.h	\
+	RelocationComplete.h	\
+	U-RNTIQueryRequest.h	\
+	U-RNTIQueryResponse.h	\
+	PrivateMessage.h	\
+	IE.h
+
+AM_CFLAGS = $(ASN1C_CFLAGS) -I.
+
+noinst_LIBRARIES=libosmo-asn1-hnbap.a
+libosmo_asn1_hnbap_a_SOURCES=$(ASN_MODULE_FILES)
+include_HEADERS = $(ASN_MODULE_INC)
+libosmo_asn1_hnbap_a_LIBADD=$(ASN1C_LDADD)