=== configure.in
==================================================================
--- configure.in        (revision 918)
+++ configure.in        (revision 919)
@@ -176,6 +176,22 @@
 #
 # Replace xgettext by our PluginInfo aware wrapper script
 #
+
+XGETTEXT_XCOMMENT=`echo 'Test("1")' |\
+       xgettext -L C\# -k'Test:1,"XCOMMENT"' -o- - |\
+       grep XCOMMENT`
+
+if test "x#. XCOMMENT" = "x${XGETTEXT_XCOMMENT}"; then
+       XGETTEXT_PLUGIN_NAME=',"Plugin Name"'
+       XGETTEXT_PLUGIN_DESC=',"Plugin Description"'
+else
+       XGETTEXT_PLUGIN_NAME=
+       XGETTEXT_PLUGIN_DESC=
+fi
+
+AC_SUBST(XGETTEXT_PLUGIN_NAME)
+AC_SUBST(XGETTEXT_PLUGIN_DESC)
+
 INTLTOOL_UPDATE="XGETTEXT=\$(top_builddir)/pot-update $INTLTOOL_UPDATE"
 AC_CONFIG_FILES([pot-update], [chmod +x pot-update])
 
=== pot-update.in
==================================================================
--- pot-update.in       (revision 918)
+++ pot-update.in       (revision 919)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-@XGETTEXT@ --keyword='PluginInfo:1,"PluginName"' "$@"
-@XGETTEXT@ --keyword='PluginInfo:4,"PluginDescription"' "$@" --join-existing --sort-by-file
+@XGETTEXT@ --keyword='PluginInfo:1@XGETTEXT_PLUGIN_NAME@' "$@"
+@XGETTEXT@ --keyword='PluginInfo:4@XGETTEXT_PLUGIN_DESC@' "$@" --join-existing --sort-by-file