diff --git a/configure.ac b/configure.ac
index 05d92dd8..05132d65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,9 @@ requirements="\
    eet >= 1.6.99 \
    evas >= 1.2.99 \
    ecore >= 1.2.99 \
-   edje >= 1.2.99"
+   edje >= 1.2.99 \
+   emotion >= 1.0.99 \
+   "
 
 PKG_CHECK_MODULES([TERMINOLOGY], [${requirements}])
 
diff --git a/src/bin/main.c b/src/bin/main.c
index 3edb5786..79811442 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -117,7 +117,17 @@ elm_main(int argc, char **argv)
 
    for (i = 1; i < argc; i++)
      {
-        if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
+        if ((!strcmp(argv[i], "-h")) ||
+            (!strcmp(argv[i], "-help")) ||
+            (!strcmp(argv[i], "--help")))
+          {
+             printf("Options:\n"
+                    "  -e CMD   Execute command CMD instead of the users shell\n"
+                    "  -t THEME Use the named edje theme or path to theme file\n"
+                    "  -b FILE  Use the named file as a background wallpaper\n");
+             exit(0);
+          }
+        else if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
           {
              i++;
              cmd = argv[i];