diff --git a/Makefile.am b/Makefile.am
index 05ef119..d289b2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = hal
+SUBDIRS = hal qahw_api
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 2968f4b..a2584ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,7 @@
 AC_CONFIG_FILES([ \
         Makefile \
         hal/Makefile \
+        qahw_api/Makefile
         ])
 
 AC_OUTPUT
diff --git a/qahw_api/Makefile.am b/qahw_api/Makefile.am
new file mode 100644
index 0000000..78b34c4
--- /dev/null
+++ b/qahw_api/Makefile.am
@@ -0,0 +1,14 @@
+AM_CFLAGS = -I $(top_srcdir)/qahw_api/inc
+
+h_sources = inc/qahw_api.h \
+            inc/qahw_defs.h
+
+library_include_HEADERS = $(h_sources)
+library_includedir = $(includedir)/mm-audio/qahw_api/inc
+
+lib_LTLIBRARIES = libqahw.la
+libqahw_la_SOURCES = src/qahw.c
+libqahw_la_CFLAGS = $(AM_CFLAGS) -include stddef.h
+libqahw_la_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\)
+libqahw_la_LIBADD = -llog -lcutils -lhardware
+libqahw_la_LDFLAGS = -module -shared -avoid-version