diff --git a/Makefile.am b/Makefile.am
index 518533c8b..331687e14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
 
 bin_SCRIPTS = enlightenment-config
 
-EXTRA_DIST = config.rpath  README AUTHORS COPYING COPYING-PLAIN \
+EXTRA_DIST = mkinstalldirs  config.rpath  config.rpath mkinstalldirs  mkinstalldirs  config.rpath mkinstalldirs  config.rpath  config.rpath mkinstalldirs  config.rpath  README AUTHORS COPYING COPYING-PLAIN \
              enlightenment.spec.in enlightenment.spec \
 	     debian/changelog \
 	     debian/changelog.in \
diff --git a/autogen.sh b/autogen.sh
index 43cef3338..f58a5ac86 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,11 +6,15 @@ rm -f aclocal.m4 ltmain.sh
 touch README
 touch ABOUT-NLS
 
-echo "Running autopoint..." ; autopoint -f || exit 1
+#echo "Running autopoint..." ; autopoint -f || exit 1
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
+echo "Running gettextize..." ; gettextize -f --no-changelog
+# hack - gettextize is interactive and demands input from a user. "screw it".
+#sleep 20
+#kill %1
 echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
 
 if [ -z "$NOCONFIGURE" ]; then
diff --git a/configure.in b/configure.in
index 112d0b302..f819dcbdc 100644
--- a/configure.in
+++ b/configure.in
@@ -146,7 +146,7 @@ ALL_LINGUAS="bg de eo ja ru hu sl it fr"
 AC_SUBST(ALL_LINGUAS)
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.12.1])
+AM_GNU_GETTEXT_VERSION([0.14.6])
 if test "x$LIBINTL" = "x"; then
   LIBINTL="$INTLLIBS"
 fi
diff --git a/data/input_methods/scim.imc b/data/input_methods/scim.imc
index c092d283a..4af421da9 100644
Binary files a/data/input_methods/scim.imc and b/data/input_methods/scim.imc differ
diff --git a/data/input_methods/uim.imc b/data/input_methods/uim.imc
index aac18340b..40e392209 100644
Binary files a/data/input_methods/uim.imc and b/data/input_methods/uim.imc differ
diff --git a/src/bin/e_imc_main.c b/src/bin/e_imc_main.c
index 67ffe4d9b..c7854054d 100644
--- a/src/bin/e_imc_main.c
+++ b/src/bin/e_imc_main.c
@@ -18,11 +18,10 @@ main(int argc, char **argv)
    E_Input_Method_Config *write_imc = NULL;
    E_Input_Method_Config *read_imc = NULL;
    
-   int del_name = 0;
-   int del_exe = 0;
    char *file = NULL;
    char *set_name = NULL;
    char *set_exe = NULL;
+   char *set_setup = NULL;
    char *set_gtk_im_module = NULL;
    char *set_qt_im_module = NULL;
    char *set_xmodifiers = NULL;
@@ -45,6 +44,13 @@ main(int argc, char **argv)
              valid_args++;
              write_ops++;
 	  }
+	else if ((!strcmp(argv[i], "-set-setup")) && (i < (argc - 1)))
+	  {
+	     i++;
+	     set_setup = argv[i];
+             valid_args++;
+             write_ops++;
+	  }
 	else if ((!strcmp(argv[i], "-set-gtk-im-module")) && (i < (argc - 1)))
 	  {
 	     i++;
@@ -66,25 +72,6 @@ main(int argc, char **argv)
              valid_args++;
              write_ops++;
 	  }
-	else if ((!strcmp(argv[i], "-del-all")))
-	  {
-	     del_name = 1;
-	     del_exe = 1;
-             valid_args++;
-             write_ops++;
-	  }
-	else if ((!strcmp(argv[i], "-del-name")))
-	  {
-	     del_name = 1;
-             valid_args++;
-             write_ops++;
-	  }
-	else if ((!strcmp(argv[i], "-del-exe")))
-	  {
-	     del_exe = 1;
-             valid_args++;
-             write_ops++;
-	  }
 	else if ((!strcmp(argv[i], "-h")) ||
 		 (!strcmp(argv[i], "-help")) ||
 		 (!strcmp(argv[i], "--h")) ||
@@ -144,23 +131,16 @@ main(int argc, char **argv)
      {
 	int write_ok;
 	
-	write_imc = malloc(sizeof(E_Input_Method_Config));
+	write_imc = calloc(sizeof(E_Input_Method_Config), 1);
 	write_imc->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
-	if (read_imc == NULL)
-	  {
-	     write_imc->e_im_name = NULL;
-	     write_imc->gtk_im_module = NULL;
-	     write_imc->qt_im_module = NULL;
-	     write_imc->xmodifiers = NULL;
-	     write_imc->e_im_exec = NULL;
-	  }
-	else
+	if (read_imc != NULL)
 	  {
 	     write_imc->e_im_name = read_imc->e_im_name;
 	     write_imc->gtk_im_module = read_imc->gtk_im_module;
 	     write_imc->qt_im_module = read_imc->qt_im_module;
 	     write_imc->xmodifiers = read_imc->xmodifiers;
 	     write_imc->e_im_exec = read_imc->e_im_exec;
+	     write_imc->e_im_setup_exec = read_imc->e_im_setup_exec;
 	  }
 	     
 	if (set_name != NULL)	
@@ -173,7 +153,9 @@ main(int argc, char **argv)
 	  write_imc->xmodifiers = set_xmodifiers;
 	if (set_exe != NULL)
 	  write_imc->e_im_exec = set_exe;
-	
+	if (set_setup != NULL)
+	  write_imc->e_im_setup_exec = set_setup;
+
 	
 	/* write imc to file */
 	write_ok = e_intl_input_method_config_write (ef, write_imc);
@@ -186,6 +168,7 @@ main(int argc, char **argv)
 	printf("Config Version:\t%d\n", read_imc->version);
 	printf("Config Name:\t%s\n", read_imc->e_im_name);
 	printf("Command Line:\t%s\n", read_imc->e_im_exec);
+	printf("Setup Line:\t%s\n", read_imc->e_im_setup_exec);
 	printf("gtk_im_module:\t%s\n", read_imc->gtk_im_module);
 	printf("qt_im_module:\t%s\n", read_imc->qt_im_module);
 	printf("xmodifiers:\t%s\n", read_imc->xmodifiers);
@@ -206,11 +189,10 @@ _e_help(void)
    printf("OPTIONS:\n"
 	  "  -set-name NAME             Set the application name\n"
 	  "  -set-exe EXE               Set the application execute line\n"
-	  "  -set-gtk-im-module		Set the gtk_im_module env var\n"
-	  "  -set-qt-im-module		Set the qt_im_module env var\n"
-	  "  -set-xmodifiers		Set the xmodifiers env var\n"
-	  "  -del-name                  Delete the application name\n"
-	  "  -del-exe                   Delete the application execute line\n"
-	  "  -list			List Contents of Input Method Config file\n"
+	  "  -set-setup EXE             Set the setup application execute line\n"
+	  "  -set-gtk-im-module         Set the gtk_im_module env var\n"
+	  "  -set-qt-im-module          Set the qt_im_module env var\n"
+	  "  -set-xmodifiers            Set the xmodifiers env var\n"
+	  "  -list                      List Contents of Input Method Config file\n"
 	  );
 }
diff --git a/src/bin/e_int_config_imc.c b/src/bin/e_int_config_imc.c
index 9765329c2..0cfdaf8ee 100644
--- a/src/bin/e_int_config_imc.c
+++ b/src/bin/e_int_config_imc.c
@@ -267,7 +267,7 @@ _e_imc_setup_cb(void *data, void *data2)
 	if (imc && imc->e_im_setup_exec)
 	  {
 	     Ecore_Exe *exe;
-	     char *cmd;
+	     const char *cmd;
 	     
 	     cmd = imc->e_im_setup_exec;
 
@@ -725,12 +725,12 @@ _e_imc_change_enqueue(E_Config_Dialog_Data *cfdata)
 	imc_update->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
 	
 	/* TODO: need to only add if the string is not empty */
-	imc_update->e_im_name = (char *) evas_stringshare_add(cfdata->imc.e_im_name);
-	imc_update->e_im_exec = (char *) evas_stringshare_add(cfdata->imc.e_im_exec);
-	imc_update->e_im_setup_exec = (char *) evas_stringshare_add(cfdata->imc.e_im_setup_exec);
-	imc_update->gtk_im_module = (char *) evas_stringshare_add(cfdata->imc.gtk_im_module);
-        imc_update->qt_im_module = (char *) evas_stringshare_add(cfdata->imc.qt_im_module);
-        imc_update->xmodifiers = (char *) evas_stringshare_add(cfdata->imc.xmodifiers);
+	imc_update->e_im_name = evas_stringshare_add(cfdata->imc.e_im_name);
+	imc_update->e_im_exec = evas_stringshare_add(cfdata->imc.e_im_exec);
+	imc_update->e_im_setup_exec = evas_stringshare_add(cfdata->imc.e_im_setup_exec);
+	imc_update->gtk_im_module = evas_stringshare_add(cfdata->imc.gtk_im_module);
+        imc_update->qt_im_module = evas_stringshare_add(cfdata->imc.qt_im_module);
+        imc_update->xmodifiers = evas_stringshare_add(cfdata->imc.xmodifiers);
 
 	/* look for changes to this file and remove them */
 	imc_update_old = evas_hash_find(cfdata->imc_change_map, cfdata->imc_current);
diff --git a/src/bin/e_intl.h b/src/bin/e_intl.h
index aa71f67a5..9f3389d4d 100644
--- a/src/bin/e_intl.h
+++ b/src/bin/e_intl.h
@@ -39,12 +39,12 @@ struct _E_Language_Pack
 struct _E_Input_Method_Config
 {
    int version;
-   char *e_im_name;
-   char *gtk_im_module;
-   char *qt_im_module;
-   char *xmodifiers;
-   char *e_im_exec;
-   char *e_im_setup_exec;
+   const char *e_im_name;
+   const char *gtk_im_module;
+   const char *qt_im_module;
+   const char *xmodifiers;
+   const char *e_im_exec;
+   const char *e_im_setup_exec;
 };
 
 struct _E_Locale_Parts