diff --git a/Makefile.am b/Makefile.am
index e595b3e6bc..736582a0ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ EXTRA_DIST = FAQ HACKING MAINTAINERS STATUS src/extras/COPYING \
 MOSTLYCLEANFILES =
 BUILT_SOURCES =
 SUFFIXES = 
+NULL =
 
 # List of programs, libraries and headers that need to be built and/or
 # distributed. Initialized to empty because we'll use += later.
diff --git a/bootstrap b/bootstrap
index 5093507c8d..afba32da32 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.35 2002/12/25 21:02:35 massiot Exp $
+##  $Id: bootstrap,v 1.36 2002/12/25 22:05:16 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -275,7 +275,9 @@ fi
 if test "$do_po" = "yes"
 then
   cd po
-  make update-po #2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//'
+  rm -f vlc.pot
+  make vlc.pot
+  make update-po
   cd ..
 
   exit 0
diff --git a/configure.ac.in b/configure.ac.in
index e652db3e19..3a1a12fc18 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -62,6 +62,7 @@ if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
   INCLUDES="${INCLUDES} -I\\\$(top_srcdir)/intl"
 fi
 AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
+XGETTEXT="${XGETTEXT} --keyword=_NS"
 
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
diff --git a/ipkg/Makefile.am b/ipkg/Makefile.am
index f173f9d725..c595aed656 100644
--- a/ipkg/Makefile.am
+++ b/ipkg/Makefile.am
@@ -1,3 +1,4 @@
+NULL =
 EXTRA_DIST = \
 	patch \
 	control \