diff --git a/ChangeLog b/ChangeLog
index fd1ae4722a..dd42b46ab2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-07-03  Wim Taymans  <wim@fluendo.com>
+
+	Patch by: Peter Kjellerstedt <pkj at axis dot com>
+
+	* gst/gst-i18n-app.h:
+	* gst/gst-i18n-lib.h:
+	* tools/gst-inspect.c: (print_signal_info):
+	The attached patch will make the inclusion of gettext.h unconditional in
+	gst/gst-i18n-app.h and gst/gst-i18n-lib.h, and it will remove the inclusion of
+	libintl.h in tools/gst-inspect.c.
+	This allows use of --disable-nls again and fixes #344642.
+
 2006-07-03  Edward Hervey  <edward@fluendo.com>
 
 	* gst/gstpad.c: (handle_pad_block), (gst_pad_push_event):
diff --git a/common b/common
index a98b370bd4..dd173e2720 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a98b370bd49bc3f3225bbd9013cda5a53789f53d
+Subproject commit dd173e2720ac21e4a47c97705d7ff32271a0ee66
diff --git a/gst/gst-i18n-app.h b/gst/gst-i18n-app.h
index 42239095bf..65e27ba6cb 100644
--- a/gst/gst-i18n-app.h
+++ b/gst/gst-i18n-app.h
@@ -23,9 +23,10 @@
 #ifndef __GST_I18N_APP_H__
 #define __GST_I18N_APP_H__
 
-#ifdef ENABLE_NLS
 #include "gettext.h" /* included with gettext distribution and copied */
 
+#ifdef ENABLE_NLS
+
 /* we want to use shorthand _() for translating and N_() for marking */
 #define _(String) gettext (String)
 #define N_(String) gettext_noop (String)
diff --git a/gst/gst-i18n-lib.h b/gst/gst-i18n-lib.h
index 60a5f9f5a9..3bd3bc1fa8 100644
--- a/gst/gst-i18n-lib.h
+++ b/gst/gst-i18n-lib.h
@@ -27,10 +27,10 @@
 #error You must include config.h before including this header.
 #endif
 
-#ifdef ENABLE_NLS
-
 #include "gettext.h" /* included with gettext distribution and copied */
 
+#ifdef ENABLE_NLS
+
 /* we want to use shorthand _() for translating and N_() for marking */
 #define _(String) dgettext (GETTEXT_PACKAGE, String)
 #define N_(String) gettext_noop (String)
diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index e161bcb1d7..1fedc8f783 100644
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@ -31,7 +31,6 @@
 
 #include <string.h>
 #include <locale.h>
-#include <libintl.h>
 #include <glib/gprintf.h>
 
 static char *_name;