diff --git a/Makefile.am b/Makefile.am
index 201adeabed..84aef0feae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,8 @@ cellwired_LDADD = \
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
+    -I$(top_srcdir)/lib/asn/asn1c \
+    -I$(top_srcdir)/lib/asn/src \
     -I$(top_srcdir)/lib/logger \
     -I$(top_srcdir)/src
 
diff --git a/configure.ac b/configure.ac
index ea5a59bb2f..b8fd56c951 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,7 +244,6 @@ AC_SUBST(OSLIBS)
 #### Conclusion. ####
 #####################
 
-AC_CONFIG_FILES([lib/Makefile])
 AC_CONFIG_FILES([lib/core/include/core.h])
 AC_CONFIG_FILES([lib/core/src/Makefile])
 case $host in
@@ -255,10 +254,11 @@ esac
 AC_CONFIG_FILES([lib/core/test/Makefile])
 AC_CONFIG_FILES([lib/core/Makefile])
 AC_CONFIG_FILES([lib/logger/Makefile])
-AC_CONFIG_FILES([lib/asn/asn1c/Makefile])
+AC_CONFIG_FILES([lib/asn/src/asn1c/Makefile])
 AC_CONFIG_FILES([lib/asn/src/Makefile])
 AC_CONFIG_FILES([lib/asn/test/Makefile])
 AC_CONFIG_FILES([lib/asn/Makefile])
+AC_CONFIG_FILES([lib/Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/lib/asn/Makefile.am b/lib/asn/Makefile.am
index 86c34ed749..381986edcd 100644
--- a/lib/asn/Makefile.am
+++ b/lib/asn/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = asn1c src test
+SUBDIRS = src test
 
 MAINTAINERCLEANFILES = Makefile.in 
 MOSTLYCLEANFILES = *.stackdump
diff --git a/lib/asn/README b/lib/asn/README
index 18926fe8fa..a9283adfe9 100644
--- a/lib/asn/README
+++ b/lib/asn/README
@@ -17,7 +17,7 @@ user@host Documents/~/git/AuthenticEshkinKot$ \
     autoreconf -iv;./configure;make
 
 * ASN.1 encoder/decoder
-user@host ~/Documents/git/cellwire/lib/asn/asn1c$ \
-    ../../../../AuthenticEshkinKot/asn1c/asn1c \
+user@host ~/Documents/git/cellwire/lib/asn/src/asn1c$ \
+    ../../../../../AuthenticEshkinKot/asn1c/asn1c \
     -fcompound-names -gen-PER ../support/S1AP-PDU.asn
 
diff --git a/lib/asn/src/Makefile.am b/lib/asn/src/Makefile.am
index ebce78e3b7..a247af9507 100644
--- a/lib/asn/src/Makefile.am
+++ b/lib/asn/src/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = asn1c
+
 noinst_LTLIBRARIES = libasn.la
 
 libasn_la_SOURCES = \
@@ -11,15 +13,15 @@ nodist_libasn_la_SOURCES = \
 	s1ap_mme_encoder.c s1ap_mme_decoder.c
 
 libasn_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/asn/asn1c/libasn1c.la
+    $(top_srcdir)/lib/asn/src/asn1c/libasn1c.la
 
 libasn_la_LIBADD = \
-    $(top_srcdir)/lib/asn/asn1c/libasn1c.la
+    $(top_srcdir)/lib/asn/src/asn1c/libasn1c.la
 
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/asn/asn1c
+    -I$(top_srcdir)/lib/asn/src/asn1c
 
 AM_CFLAGS = \
 	-Wall -Werror -Wno-incompatible-pointer-types
diff --git a/lib/asn/test/Makefile.am b/lib/asn/test/Makefile.am
index 173e77452c..96a3cc827a 100644
--- a/lib/asn/test/Makefile.am
+++ b/lib/asn/test/Makefile.am
@@ -14,7 +14,7 @@ testasn_LDADD = \
 
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/asn/asn1c \
+    -I$(top_srcdir)/lib/asn/src/asn1c \
     -I$(top_srcdir)/lib/asn/src
 
 AM_CFLAGS = \