diff --git a/autogen.sh b/autogen.sh
index 95e1bfaefe..93f88d49b0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -88,12 +88,14 @@ toplevel_check $srcfile
 
 # autopoint
 #    first remove patch if necessary, then run autopoint, then reapply
-if test -f po/Makefile.in.in;
-then
-  patch -p0 -R --forward < common/gettext.patch
+if test -d po ; then
+  if test -f po/Makefile.in.in;
+  then
+    patch -p0 -R --forward < common/gettext.patch
+  fi
+  tool_run "$autopoint" "--force" "patch -p0 < common/gettext.patch"
+  patch -p0 < common/gettext.patch
 fi
-tool_run "$autopoint" "--force" "patch -p0 < common/gettext.patch"
-patch -p0 < common/gettext.patch
 
 # aclocal
 if test -f acinclude.m4; then rm acinclude.m4; fi
diff --git a/common b/common
index 098c0d7432..74a6857d26 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 098c0d7432be323d631b95b5d35f6f0840bf21bd
+Subproject commit 74a6857d26a22d1419c89b00ba5acbc8e2a2c68a