diff --git a/configure.ac b/configure.ac
index 975c912e7..ea5a59bb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,6 +256,7 @@ 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/Makefile])
 AC_CONFIG_FILES([lib/asn/test/Makefile])
 AC_CONFIG_FILES([lib/asn/Makefile])
 AC_CONFIG_FILES([src/Makefile])
diff --git a/lib/asn/Makefile.am b/lib/asn/Makefile.am
index 342c10587..86c34ed74 100644
--- a/lib/asn/Makefile.am
+++ b/lib/asn/Makefile.am
@@ -1,33 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = asn1c test
-
-noinst_LTLIBRARIES = libasn.la
-
-libasn_la_SOURCES = \
-	s1ap_ies_defs.h s1ap_common.h
-
-nodist_libasn_la_SOURCES = \
-	s1ap_encoder.c s1ap_decoder.c s1ap_xer_print.c \
-	s1ap_common.c
-
-libasn_la_DEPENDENCIES = \
-    $(top_srcdir)/lib/core/src/libcore.la \
-    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la
-
-libasn_la_LIBADD = \
-    $(top_srcdir)/lib/core/src/libcore.la \
-    $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la
-
-AM_CPPFLAGS = \
-    -I$(top_srcdir)/lib/core/include/arch/@OSDIR@ \
-    -I$(top_srcdir)/lib/core/include \
-    -I$(top_srcdir)/lib/asn/asn1c
-
-AM_CFLAGS = \
-	-Wall -Werror -Wno-incompatible-pointer-types
+SUBDIRS = asn1c src test
 
 MAINTAINERCLEANFILES = Makefile.in 
 MOSTLYCLEANFILES = *.stackdump
-
-EXTRA_DIST = .libs $(noinst_LTLIBRARIES)
diff --git a/lib/asn/README b/lib/asn/README
index 8feb57024..960f5deda 100644
--- a/lib/asn/README
+++ b/lib/asn/README
@@ -8,7 +8,7 @@ user@host ~/Documents/git/cellwire/lib/asn/support$ \
 
 * EUROCOM S1AP-IEs support files
 user@host ~/Documents/git/cellwire/lib/asn/support$ \
-    python asn1tostruct.py -f S1AP-PDU.asn -o ..
+    python asn1tostruct.py -f S1AP-PDU.asn -o ../src
 
 * Use AuthenticEshkinKot's fork for asn1c
 user@host ~/Documents/git/AuthenticEshkinKot$ \
diff --git a/lib/asn/mme_default_values.h b/lib/asn/src/mme_default_values.h
similarity index 100%
rename from lib/asn/mme_default_values.h
rename to lib/asn/src/mme_default_values.h
diff --git a/lib/asn/s1ap_common.c b/lib/asn/src/s1ap_common.c
similarity index 100%
rename from lib/asn/s1ap_common.c
rename to lib/asn/src/s1ap_common.c
diff --git a/lib/asn/s1ap_common.h b/lib/asn/src/s1ap_common.h
similarity index 100%
rename from lib/asn/s1ap_common.h
rename to lib/asn/src/s1ap_common.h
diff --git a/lib/asn/s1ap_decoder.c b/lib/asn/src/s1ap_decoder.c
similarity index 100%
rename from lib/asn/s1ap_decoder.c
rename to lib/asn/src/s1ap_decoder.c
diff --git a/lib/asn/s1ap_encoder.c b/lib/asn/src/s1ap_encoder.c
similarity index 100%
rename from lib/asn/s1ap_encoder.c
rename to lib/asn/src/s1ap_encoder.c
diff --git a/lib/asn/s1ap_ies_defs.h b/lib/asn/src/s1ap_ies_defs.h
similarity index 100%
rename from lib/asn/s1ap_ies_defs.h
rename to lib/asn/src/s1ap_ies_defs.h
diff --git a/lib/asn/s1ap_xer_print.c b/lib/asn/src/s1ap_xer_print.c
similarity index 100%
rename from lib/asn/s1ap_xer_print.c
rename to lib/asn/src/s1ap_xer_print.c
diff --git a/lib/asn/test/Makefile.am b/lib/asn/test/Makefile.am
index 4bcb90ca9..569b3a93e 100644
--- a/lib/asn/test/Makefile.am
+++ b/lib/asn/test/Makefile.am
@@ -10,14 +10,13 @@ testasn_SOURCES = \
 testasn_LDADD = \
     $(top_srcdir)/lib/core/src/libcore.la \
     $(top_srcdir)/lib/asn/asn1c/libasn1c.la \
-    $(top_srcdir)/lib/asn/libasn.la \
+    $(top_srcdir)/lib/asn/src/libasn.la \
     -lpthread -lsctp
 
 AM_CPPFLAGS = \
-    -I$(top_srcdir)/lib/core/include/arch/@OSDIR@ \
     -I$(top_srcdir)/lib/core/include \
     -I$(top_srcdir)/lib/asn/asn1c \
-    -I$(top_srcdir)/lib/asn
+    -I$(top_srcdir)/lib/asn/src
 
 AM_CFLAGS = \
 	-Wall -Werror @OSCFLAGS@ \