diff --git a/ChangeLog b/ChangeLog
index 9e715ab579..521514f3bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-10-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/minibuffer.C (Init): make sure that the "Welcome to LyX!"
+	is not overwritten when translated (David Sua'rez de Lis).
+
+	* lib/CREDITS: Added David Sua'rez de Lis
+
+	* lib/reLyX/configure.in: setup LYX_DIR correctly in reLyX.
+
+	* src/bufferparams.C (BufferParams): default input encoding is now
+	"latin1" 
+
 1999-10-04  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* src/table.C (getDocBookAlign): remove bad default value for
diff --git a/configure.in b/configure.in
index 6604b426ad..e2d181bf7a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,3 @@
-#! /bin/bash
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(src/lyx.C)
diff --git a/lib/CREDITS b/lib/CREDITS
index 650aa68176..c94bf5f94c 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -140,6 +140,10 @@
 @bAndre Spiegel
 @iE-mail: spiegel@inf.fu-berlin.de
    vertical spaces
+@bDavid Sua'rez de Lis
+@iE-mail: excalibor@iname.com
+   maintaining es.po since v1.0.0 and other small i18n issues
+   small fixes (some work, others didn't)
 @bPeter Sütterlin
 @iE-mail: pit@uni-sw.gwdg.de
    aapaper support, bug reports
diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in
index 8bc3ebd9ef..f2bffd773f 100644
--- a/lib/reLyX/configure.in
+++ b/lib/reLyX/configure.in
@@ -1,6 +1,7 @@
-dnl Process this file with autoconf to produce a configure script.
+dnl Process with autoconf to generate configure script   -*- sh -*-
 AC_INIT(reLyX.in)
 AC_PREREQ(2.13) dnl We want to use autoconf 2.13
+AC_PREFIX_PROGRAM(reLyX)
 
 PACKAGE=reLyX
 VERSION=2.0
@@ -11,17 +12,10 @@ dnl Checks for programs.
 AC_PROG_INSTALL
 RELYX_CHECK_PERL
 
-dnl Checks for libraries.
-dnl Replace `main' with a function in -lXpm:
-dnl AC_CHECK_LIB(Xpm, main)
-dnl Replace `main' with a function in -lforms:
-dnl AC_CHECK_LIB(forms, main)
-
-dnl Checks for header files.
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-dnl Checks for library functions.
+dnl Finish the work
+test $program_suffix = NONE && program_suffix=
+LYX_DIR=`eval "echo \`eval \"echo ${datadir}/lyx${program_suffix}\"\`"`
+AC_SUBST(LYX_DIR)
 
 AC_OUTPUT(Makefile reLyX, chmod 755 reLyX)
 
diff --git a/src/bufferparams.C b/src/bufferparams.C
index d043f6583a..bfe6dcc8a5 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -42,7 +42,7 @@ BufferParams::BufferParams()
 	tocdepth = 3;
 	language = "default";
 	fonts = "default";
-	inputenc = "default";
+	inputenc = "latin1";
 	graphicsDriver = "default";
 	sides = 1;
 	columns = 1;
diff --git a/src/minibuffer.C b/src/minibuffer.C
index 5aff9a4aff..a05d9c0a49 100644
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -184,7 +184,7 @@ void MiniBuffer::Init()
 			if (!owner->currentBuffer()->isLyxClean())
 				text += _(" (Changed)");
 	} else {
-		if (text != "Welcome to LyX!") // this is a hack
+		if (text != _("Welcome to LyX!")) // this is a hack
 			text = _("* No document open *");
 	}