diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..9093308
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = \
+	autogen.sh
+
+SUBDIRS = src data
diff --git a/antigen.sh b/antigen.sh
new file mode 100755
index 0000000..8583cd4
--- /dev/null
+++ b/antigen.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if test -f Makefile; then
+    make distclean
+fi
+
+rm -f *.tar.* *.tgz
+rm -Rf autom4te.cache
+rm -f src/Makefile.in Makefile.in aclocal.m4 configure depcomp install-sh missing build-stamp configure-stamp
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..afd87cb
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+aclocal-1.7
+autoconf --force
+autoheader --force
+automake-1.7 --add-missing --copy --force-missing --foreign
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..0475ec1
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,53 @@
+AC_INIT(Makefile.am)
+AM_INIT_AUTOMAKE(eye-on-manga, 0.1)
+AM_CONFIG_HEADER(config.h)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_HEADER_STDC
+
+# Option to enable debugging
+AC_ARG_ENABLE(debug,
+                [AC_HELP_STRING([ --enable-debug], [Debugging (default=no)])],
+                [with_debug=yes], [with_debug=no])
+
+if test "x$with_debug" == "xyes" ; then
+   CFLAGS="$CFLAGS -ggdb -O0 -DDEBUG -Wall "
+else
+   CFLAGS="$CFLAGS -O2 -Wall "
+fi
+
+# Hildon library dependencies
+PKG_CHECK_MODULES(HILDON, hildon-1)
+AC_SUBST(HILDON_LIBS)
+AC_SUBST(HILDON_CFLAGS)
+
+# To make the application visible in maemo Task Navigator it needs a Desktop
+# file for the application.
+desktopentrydir=`$PKG_CONFIG osso-af-settings --variable=desktopentrydir`
+
+# Application pixmaps install directory
+pixmapdir=`$PKG_CONFIG osso-af-settings --variable=hildonpixmapdir`
+
+# Application icon install directories
+icon_26x26dir=$datadir/icons/hicolor/26x26/hildon
+icon_34x34dir=$datadir/icons/hicolor/34x34/hildon
+icon_40x40dir=$datadir/icons/hicolor/40x40/hildon
+icon_50x50dir=$datadir/icons/hicolor/50x50/hildon
+icon_scalabledir=$datadir/icons/hicolor/scalable/hildon
+
+# Define as variables in Makefile
+AC_SUBST(desktopentrydir)
+AC_SUBST(pixmapdir)
+AC_SUBST(icon_26x26dir)
+AC_SUBST(icon_34x34dir)
+AC_SUBST(icon_40x40dir)
+AC_SUBST(icon_50x50dir)
+AC_SUBST(icon_scalabledir)
+
+AC_DEFINE_UNQUOTED([PIXMAPDIR], "${pixmapdir}", [Runtime pixmap files path])
+AC_OUTPUT(
+        Makefile \
+        src\Makefile \
+        data\Makefile
+)
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..696696c
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,6 @@
+desktopentry_DATA = eye-on-manga.desktop
+
+icon_48x48_DATA = icons/48x48/eye-on-manga.png
+icon_scalable_DATA = icons/scalable/eye-on-manga.png
+
+EXTRA_DIST = $(desktopentry_DATA) $(icon_48x48_DATA) $(icon_scalable_DATA)
diff --git a/data/eye-on-manga.desktop b/data/eye-on-manga.desktop
new file mode 100644
index 0000000..92ae14e
--- /dev/null
+++ b/data/eye-on-manga.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.1
+Type=Application
+Name=Eye on Manga
+Exec=/usr/bin/eye-on-manga
+Icon=eye-on-manga
+X-Window-Icon=eye-on-manga
+X-Window-Icon-Dimmed=eye-on-manga
diff --git a/data/icons/64x64/eye-on-manga.png b/data/icons/64x64/eye-on-manga.png
new file mode 100644
index 0000000..5d62067
Binary files /dev/null and b/data/icons/64x64/eye-on-manga.png differ
diff --git a/data/icons/scalable/eye-on-manga.png b/data/icons/scalable/eye-on-manga.png
new file mode 100644
index 0000000..5d62067
Binary files /dev/null and b/data/icons/scalable/eye-on-manga.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..afdd933
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,13 @@
+bin_PROGRAMS = eye-on-manga
+
+eye-on-manga_LDADD = $(HILDON_LIBS)
+
+eye-on-manga_CFLAGS = $(HILDON_CFLAGS)
+
+eye-on-manga_SOURCES = \
+	data.c data.h \
+	eom.c eom.h \
+	eom-edit-window.c eom-edit-window.h \
+	eom-main-window.c eom-main-window.h \
+	eom-new-item-dialog.c eom-new-item-dialog.h \
+	interface.c interface.h
diff --git a/src/Makefile b/src/Makefile.orig
similarity index 100%
rename from src/Makefile
rename to src/Makefile.orig