diff --git a/configure.ac b/configure.ac
index 2d45f21c..0638907a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,9 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
 AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads],
 		[enable threading support]), [enable_threads=${enableval}])
 
+AC_CHECK_LIB(dl, dlopen, dummy=yes,
+			AC_MSG_ERROR(dynamic linking loader is required))
+
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
 				AC_MSG_ERROR(GLib >= 2.16 is required))
 AC_SUBST(GLIB_CFLAGS)
diff --git a/include/Makefile.am b/include/Makefile.am
index 02742923..8f3fef2e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,2 +1,16 @@
 
+includedir = @includedir@/ofono
+
+include_HEADERS = log.h
+
 MAINTAINERCLEANFILES = Makefile.in
+
+all-local:
+	@if [ ! -e ofono ]; then \
+	  mkdir ofono; \
+	  list='$(include_HEADERS)'; for i in $$list; \
+	    do $(LN_S) $(abs_top_srcdir)/include/$$i ofono/$$i; done; \
+	fi
+
+clean-local:
+	@rm -rf ofono
diff --git a/include/log.h b/include/log.h
new file mode 100644
index 00000000..cdd3b0f5
--- /dev/null
+++ b/include/log.h
@@ -0,0 +1,53 @@
+/*
+ *
+ *  oFono - Open Telephony stack for Linux
+ *
+ *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __OFONO_LOG_H
+#define __OFONO_LOG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * SECTION:log
+ * @title: Logging premitives
+ * @short_description: Functions for logging error and debug information
+ */
+
+extern void ofono_info(const char *format, ...);
+extern void ofono_error(const char *format, ...);
+extern void ofono_debug(const char *format, ...);
+
+/**
+ * DBG:
+ * @fmt: format string
+ * @arg...: list of arguments
+ *
+ * Simple macro around ofono_debug() which also include the function
+ * name it is called in.
+ */
+#define DBG(fmt, arg...) ofono_debug("%s:%s() " fmt, __FILE__, __FUNCTION__ , ## arg)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __OFONO_LOG_H */
diff --git a/src/Makefile.am b/src/Makefile.am
index 02742923..2bf71061 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,33 @@
 
+sbin_PROGRAMS = ofonod
+
+ofonod_SOURCES = main.c ofono.h log.c
+
+ofonod_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ -ldl
+
+ofonod_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=ofono.ver
+
+ofonod_DEPENDENCIES = ofono.ver
+
+CLEANFILES = ofono.ver ofono.exp
+
+if MAINTAINER_MODE
+plugindir = $(abs_top_srcdir)/plugins/.libs
+else
+plugindir = $(libdir)/ofono/plugins
+endif
+
+AM_CFLAGS = @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
+					-DPLUGINDIR=\""$(plugindir)"\"
+
+INCLUDES = -I$(top_builddir)/include
+
 MAINTAINERCLEANFILES = Makefile.in
+
+ofono.exp: $(ofonod_OBJECTS)
+	nm -B *.o | awk '{ print $$3 }' | sort -u | grep -E -e '^ofono_' > $@
+
+ofono.ver: ofono.exp
+	echo "{ global:" > $@
+	cat $< | sed -e "s/\(.*\)/\1;/" >> $@
+	echo "local: *; };" >> $@
diff --git a/src/log.c b/src/log.c
new file mode 100644
index 00000000..d79c99fb
--- /dev/null
+++ b/src/log.c
@@ -0,0 +1,111 @@
+/*
+ *
+ *  oFono - Open Telephony stack for Linux
+ *
+ *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdarg.h>
+#include <syslog.h>
+
+#include "ofono.h"
+
+static volatile gboolean debug_enabled = FALSE;
+
+/**
+ * ofono_info:
+ * @format: format string
+ * @Varargs: list of arguments
+ *
+ * Output general information
+ */
+void ofono_info(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+
+	vsyslog(LOG_INFO, format, ap);
+
+	va_end(ap);
+}
+
+/**
+ * ofono_error:
+ * @format: format string
+ * @varargs: list of arguments
+ *
+ * Output error messages
+ */
+void ofono_error(const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+
+	vsyslog(LOG_ERR, format, ap);
+
+	va_end(ap);
+}
+
+/**
+ * ofono_debug:
+ * @format: format string
+ * @varargs: list of arguments
+ *
+ * Output debug message
+ *
+ * The actual output of the debug message is controlled via a command line
+ * switch. If not enabled, these messages will be ignored.
+ */
+void ofono_debug(const char *format, ...)
+{
+	va_list ap;
+
+	if (debug_enabled == FALSE)
+		return;
+
+	va_start(ap, format);
+
+	vsyslog(LOG_DEBUG, format, ap);
+
+	va_end(ap);
+}
+
+int __ofono_log_init(void)
+{
+	int option = LOG_NDELAY | LOG_PID;
+
+	openlog("ofonod", option, LOG_DAEMON);
+
+	syslog(LOG_INFO, "oFono version %s", VERSION);
+
+	debug_enabled = TRUE;
+
+	return 0;
+}
+
+void __ofono_log_cleanup(void)
+{
+	syslog(LOG_INFO, "Exit");
+
+	closelog();
+}
diff --git a/src/main.c b/src/main.c
new file mode 100644
index 00000000..de49ff4a
--- /dev/null
+++ b/src/main.c
@@ -0,0 +1,35 @@
+/*
+ *
+ *  oFono - Open Telephony stack for Linux
+ *
+ *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "ofono.h"
+
+int main(int argc, char *argv[])
+{
+	__ofono_log_init();
+
+	__ofono_log_cleanup();
+
+	return 0;
+}
diff --git a/src/ofono.h b/src/ofono.h
new file mode 100644
index 00000000..03b4eeb1
--- /dev/null
+++ b/src/ofono.h
@@ -0,0 +1,29 @@
+/*
+ *
+ *  oFono - Open Telephony stack for Linux
+ *
+ *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <glib.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+
+#include <ofono/log.h>
+
+int __ofono_log_init(void);
+void __ofono_log_cleanup(void);