--- trunk.orig/configure.ac	2008-02-15 13:06:30.000000000 +0100
+++ enigma-1.10/configure.ac	2008-02-22 12:47:18.000000000 +0100
@@ -65,6 +65,31 @@
  CPPFLAGS="$CPPFLAGS -DMACOSX"
 fi
 
+dnl ---------- maemo ----------
+if test "x$LINUX" = xyes; then
+  AC_MSG_CHECKING(for Maemo)
+  # the following line is probably not what we want, but it's working
+  if ! pkg-config --exists maemo-version-dev; then
+    MAEMO=yes
+    AC_MSG_RESULT(yes)
+    PKG_CHECK_MODULES(OSSO, [libosso >= 0.9.19],
+       AC_DEFINE(HAVE_LIBOSSO, [], [Whether libosso is present on the system]), 
+       [AC_MSG_NOTICE([libosso not present.])])
+
+    AC_SUBST(OSSO_LIBS)
+    AC_SUBST(OSSO_CFLAGS)
+    CFLAGS="$CFLAGS -DMAEMO -DTOUCHSCREEN $OSSO_CFLAGS"
+    CXXFLAGS="$CXXFLAGS -DMAEMO $OSSO_CFLAGS"
+    LIBS="$LIBS $OSSO_LIBS"
+  else
+    AC_MSG_RESULT(no)
+  fi
+  # the following is currently not used
+  AC_SUBST(MAEMO)
+fi
+
+AM_CONDITIONAL(MAEMO, test x$MAEMO = xyes)
+
 dnl ---------- Texi2html ----------
 AC_PATH_PROG(TEXI2HTML, texi2html, "")
 
--- trunk.orig/Makefile.am	2008-02-15 13:06:30.000000000 +0100
+++ enigma-1.10/Makefile.am	2008-02-22 13:32:16.000000000 +0100
@@ -3,12 +3,18 @@
 #   tools -> lib-src/lua
 #   src   -> tools, lib-src
 #
-SUBDIRS = m4 lib-src tools intl src data doc po etc
+SUBDIRS = m4 lib-src tools intl src data po etc
 EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
 
 docdir = @datadir@/doc/enigma
 doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
 
+if MAEMO
+doc_DATA += install_memcard.txt
+else
+SUBDIRS += doc
+endif
+
 ACLOCAL_AMFLAGS = -I m4
 
 tolua:
--- trunk.orig/src/main.cc	2008-02-15 13:04:14.000000000 +0100
+++ enigma-1.10/src/main.cc	2008-02-22 13:29:47.000000000 +0100
@@ -167,7 +167,11 @@
     nosound  = nomusic = show_help = show_version = do_log = do_assert = force_window = false;
     dumpinfo = makepreview = show_fps = false;
     gamename = "";
+#ifndef MAEMO
     datapath = "";
+#else
+    datapath = "/media/mmc2/enigma"; // default alternate datapath for maemo on memory card
+#endif
     preffilename = PREFFILENAME;
 
     def (&nosound,              "nosound");