diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..8009b42
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,2 @@
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = libqdmetadata
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..8950b21
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,52 @@
+#                                               -*- Autoconf -*-
+# configure.ac -- Autoconf script for display commonsys intf
+#
+
+# Process this file with autoconf to produce a configure script
+
+# Requires autoconf tool later than 2.61
+AC_PREREQ(2.61)
+# Initialize the display commonsys intf package version 1.0.0
+AC_INIT([disp-commonsys-intf],1.0.0)
+# Does not strictly follow GNU Coding standards
+AM_INIT_AUTOMAKE([foreign])
+# Disables auto rebuilding of configure, Makefile.ins
+AM_MAINTAINER_MODE
+# defines some macros variable to be included by source
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AC_SUBST([AM_CPPFLAGS], [--std=c++11])
+
+AC_ARG_WITH([core_includes],
+    AC_HELP_STRING([--with-core-includes=@<:@dir@:>@],
+       [Specify the location of the core headers]),
+    [core_incdir=$withval],
+    with_core_includes=no)
+
+if test "x$with_core_includes" != "xno"; then
+   CFLAGS="${CFLAGS} -I${core_incdir}"
+fi
+
+AC_ARG_WITH(sanitized-headers,
+   AS_HELP_STRING([--with-sanitized-headers=DIR],
+       [Specify the location of the sanitized Linux headers]),
+   [CPPFLAGS="$CPPFLAGS -I$withval"])
+
+# Checks for programs.
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+AC_PROG_AWK
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+
+AC_SUBST([CFLAGS])
+AC_SUBST([CC])
+AC_CONFIG_FILES([ \
+        Makefile \
+        libqdmetadata/Makefile
+        ])
+AC_OUTPUT
diff --git a/libqdmetadata/Makefile.am b/libqdmetadata/Makefile.am
index 01fbf19..24b1c4a 100644
--- a/libqdmetadata/Makefile.am
+++ b/libqdmetadata/Makefile.am
@@ -2,8 +2,8 @@
 
 cpp_sources = qdMetaData.cpp
 
-library_includedir = $(includedir)
-library_include_HEADERS = $(h_sources)
+qdMetaData_includedir = $(pkgincludedir)/display
+qdMetaData_include_HEADERS = $(h_sources)
 
 lib_LTLIBRARIES = libqdMetaData.la
 libqdMetaData_la_CC = @CC@
@@ -12,21 +12,3 @@
 libqdMetaData_la_CPPFLAGS = $(AM_CPPFLAGS)
 libqdMetaData_LDADD = -lcutils -llog
 libqdMetaData_la_LDFLAGS = -shared -avoid-version
-
-header_sources = display_config.h
-
-c_sources = profiler.cpp \
-            qd_utils.cpp \
-            display_config.cpp
-
-library_includedir = $(includedir)
-library_include_HEADERS = $(header_sources)
-
-lib_LTLIBRARIES += libqdutils.la
-libqdutils_la_CC = @CC@
-libqdutils_la_SOURCES = $(c_sources)
-libqdutils_la_CFLAGS = $(COMMON_CFLAGS) -DLOG_TAG=\"qdutils\"
-libqdutils_la_CPPFLAGS = $(AM_CPPFLAGS)
-libqdutils_LDADD = -lhardware -lcutils -llog -lbinder
-libqdutils_la_LIBADD = ../libqservice/libqservice.la
-libqdutils_la_LDFLAGS = -shared -avoid-version
\ No newline at end of file