diff --git a/configure.ac b/configure.ac
index 27a269b998..8dccdc41f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4327,25 +4327,24 @@ AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" ||
 	  test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
 
 dnl
-dnl Maemo
+dnl Hildon UI
 dnl
-AC_ARG_ENABLE(maemo,
-  [  --enable-maemo          Internet tablets based on Maemo SDK (default disabled)])
-if test "${enable_maemo}" = "yes"
-then
+AC_ARG_ENABLE(hildon,
+  [  --enable-hildon         Hildon touchscreen UI (default disabled)])
+AS_IF([test "${enable_hildon}" = "yes"], [
   PKG_CHECK_MODULES(HILDON, [hildon-1 hildon-fm-2], [
-    VLC_ADD_CFLAGS([maemo],[${HILDON_CFLAGS}])
-    VLC_ADD_LIBS([maemo],[${HILDON_LIBS}])
-    VLC_ADD_PLUGIN([maemo])
+    VLC_ADD_CFLAGS([hildon],[${HILDON_CFLAGS}])
+    VLC_ADD_LIBS([hildon],[${HILDON_LIBS}])
+    VLC_ADD_PLUGIN([hildon])
     ALIASES="${ALIASES} mvlc"
   ], [
-    AS_IF([test "${enable_maemo}" = "yes"],[
+    AS_IF([test "${enable_hildon}" = "yes"],[
       AC_MSG_ERROR([Hildon libraries not found])
     ])
-    enable_maemo="no"
+    enable_hildon="no"
   ])
-fi
-AM_CONDITIONAL(BUILD_MAEMO, [test "${enable_maemo}" = "yes"])
+])
+AM_CONDITIONAL(BUILD_HILDON, [test "${enable_hildon}" = "yes"])
 
 dnl
 dnl QT 4
@@ -5209,7 +5208,7 @@ AC_CONFIG_FILES([
   modules/gui/Makefile
   modules/gui/beos/Makefile
   modules/gui/macosx/Makefile
-  modules/gui/maemo/Makefile
+  modules/gui/hildon/Makefile
   modules/gui/minimal_macosx/Makefile
   modules/gui/qnx/Makefile
   modules/gui/qt4/Makefile
diff --git a/modules/gui/Modules.am b/modules/gui/Modules.am
index 87f3042f40..7f298e1083 100644
--- a/modules/gui/Modules.am
+++ b/modules/gui/Modules.am
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = beos macosx maemo minimal_macosx qnx qt4 skins2 wince
+DIST_SUBDIRS = beos macosx hildon minimal_macosx qnx qt4 skins2 wince
 SUBDIRS =
 
 if HAVE_BEOS
@@ -7,8 +7,8 @@ endif
 if HAVE_DARWIN
 SUBDIRS += macosx minimal_macosx
 endif
-if BUILD_MAEMO
-SUBDIRS += maemo
+if BUILD_HILDON
+SUBDIRS += hildon
 endif
 SUBDIRS += qnx
 if ENABLE_QT4
diff --git a/modules/gui/maemo/Modules.am b/modules/gui/hildon/Modules.am
similarity index 83%
rename from modules/gui/maemo/Modules.am
rename to modules/gui/hildon/Modules.am
index 8a4cb70da2..f55147df34 100644
--- a/modules/gui/maemo/Modules.am
+++ b/modules/gui/hildon/Modules.am
@@ -1,4 +1,4 @@
-SOURCES_maemo = maemo.c \
+SOURCES_hildon = maemo.c \
 		maemo.h \
 		maemo_callbacks.c \
 		maemo_callbacks.h \
diff --git a/modules/gui/maemo/maemo.c b/modules/gui/hildon/maemo.c
similarity index 100%
rename from modules/gui/maemo/maemo.c
rename to modules/gui/hildon/maemo.c
diff --git a/modules/gui/maemo/maemo.h b/modules/gui/hildon/maemo.h
similarity index 100%
rename from modules/gui/maemo/maemo.h
rename to modules/gui/hildon/maemo.h
diff --git a/modules/gui/maemo/maemo_callbacks.c b/modules/gui/hildon/maemo_callbacks.c
similarity index 100%
rename from modules/gui/maemo/maemo_callbacks.c
rename to modules/gui/hildon/maemo_callbacks.c
diff --git a/modules/gui/maemo/maemo_callbacks.h b/modules/gui/hildon/maemo_callbacks.h
similarity index 100%
rename from modules/gui/maemo/maemo_callbacks.h
rename to modules/gui/hildon/maemo_callbacks.h
diff --git a/modules/gui/maemo/maemo_input.c b/modules/gui/hildon/maemo_input.c
similarity index 100%
rename from modules/gui/maemo/maemo_input.c
rename to modules/gui/hildon/maemo_input.c
diff --git a/modules/gui/maemo/maemo_input.h b/modules/gui/hildon/maemo_input.h
similarity index 100%
rename from modules/gui/maemo/maemo_input.h
rename to modules/gui/hildon/maemo_input.h
diff --git a/modules/gui/maemo/maemo_interface.c b/modules/gui/hildon/maemo_interface.c
similarity index 100%
rename from modules/gui/maemo/maemo_interface.c
rename to modules/gui/hildon/maemo_interface.c
diff --git a/modules/gui/maemo/maemo_interface.h b/modules/gui/hildon/maemo_interface.h
similarity index 100%
rename from modules/gui/maemo/maemo_interface.h
rename to modules/gui/hildon/maemo_interface.h
diff --git a/share/Makefile.am b/share/Makefile.am
index 2460ce9904..43f2347f88 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -47,7 +47,7 @@ if BUILD_MOZILLA
 # TODO: move to the mozilla directory
 nobase_vlcdata_DATA += $(DIST_mozilla)
 endif
-if BUILD_MAEMO
+if BUILD_HILDON
 nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
 endif