diff --git a/src/auto/configure b/src/auto/configure
index 4ece95e..30db8a0 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -12966,7 +12966,7 @@
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: msgfmt not found - disabled" >&5
 $as_echo "msgfmt not found - disabled" >&6; };
     fi
-    if test $have_gettext = "yes"; then
+    if test $have_gettext = "yes" -a "x$features" != "xtiny" -a "x$features" != "xsmall"; then
       $as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 
       MAKEMO=yes
diff --git a/src/configure.in b/src/configure.in
index fc6d405..1cee1e6 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -3818,7 +3818,7 @@
     else
       AC_MSG_RESULT([msgfmt not found - disabled]);
     fi
-    if test $have_gettext = "yes"; then
+    if test $have_gettext = "yes" -a "x$features" != "xtiny" -a "x$features" != "xsmall"; then
       AC_DEFINE(HAVE_GETTEXT)
       MAKEMO=yes
       AC_SUBST(MAKEMO)
diff --git a/src/version.c b/src/version.c
index ab84a36..87b1942 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    385,
+/**/
     384,
 /**/
     383,