diff --git a/ChangeLog b/ChangeLog
index 283023a466..6c71437666 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
+2000-06-08  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/support/filetools.C (PutEnv): fix the code in case neither
+	putenv() nor setenv() have been found.
+
+	* INSTALL: mention the install-strip Makefile target.
+
+	* src/LyXAction.C (init): make LFUN_BUILDPROG available in
+	read-only documents.
+
 2000-06-07  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+	* lib/reLyX/configure.in (VERSION): avoid using a previously
+	generated reLyX wrapper to find out $prefix.
+
 	* lib/examples/eu_adibide_lyx-atua.lyx: 
 	* lib/examples/eu_adibide_gordina.lyx: new examples for the Basque
 	translation of the Tutorial (Dooteo)
diff --git a/INSTALL b/INSTALL
index 969b86571a..f2d6eb2cb7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -24,7 +24,8 @@ These four steps will compile, test and install LyX:
 	   runs the program so you can check it out.
 
 	4) make install
-	   will install it.
+	   will install it. You can use "make install-strip" instead
+           if you want a smaller binary. 
 
 
 Requirements
@@ -218,6 +219,12 @@ Once you've got the Makefile created, you just have to type:
 
 All should be OK ;)
 
+Since the binaries with debug information tend to be huge (although
+this does not affect the run-time memory footprint), you maight want
+to strip the lyx binary. In this case replace "make install" with
+
+  make install-strip
+
 BTW: in the images subdirectory there is also a small icon "lyx.xpm",
 that can be used to display lyx-documents in filemanagers.
 
diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in
index 21ddf267e5..b1ffdf0d7d 100644
--- a/lib/reLyX/configure.in
+++ b/lib/reLyX/configure.in
@@ -14,6 +14,9 @@ dnl must make a macro that gets the reLyX version
 VERSION=2.0
 AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
+# if reLyX has already been generated in this directory, delete it first
+test -x reLyX && rm -f reLyX
+# Find an already installed reLyX
 AC_PREFIX_PROGRAM(reLyX)
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
diff --git a/lyx.man b/lyx.man
index b3ba33419d..e9a3f96e09 100644
--- a/lyx.man
+++ b/lyx.man
@@ -144,7 +144,7 @@ can be used to specify which user directory to use.
 .PP
 The user directory is, in order of precedence: 
 .br
-1) -usedir command line parameter
+1) -userdir command line parameter
 .br
 2) LYX_USERDIR_11x environment variable
 .br
diff --git a/src/LyXAction.C b/src/LyXAction.C
index 4fc46c8dc0..2f15f9041c 100644
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -106,7 +106,8 @@ void LyXAction::init()
 		{ LFUN_BREAKPARAGRAPHKEEPLAYOUT, "break-paragraph-keep-layout",
 		  "", Noop },
 		{ LFUN_BREAKPARAGRAPH_SKIP, "break-paragraph-skip", "", Noop },
-		{ LFUN_BUILDPROG, "build-program", _("Build program"), Noop },
+		{ LFUN_BUILDPROG, "build-program", 
+		  N_("Build program"), ReadOnly },
 		{ LFUN_AUTOSAVE, "buffer-auto-save", N_("Autosave"), Noop },
 		{ LFUN_BEGINNINGBUF, "buffer-begin",
 		  N_("Go to beginning of document"), ReadOnly },
diff --git a/src/support/filetools.C b/src/support/filetools.C
index 33b0d1a70c..6523d87cda 100644
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -305,6 +305,7 @@ bool PutEnv(string const & envstr)
 {
 	// CHECK Look at and fix this.
         // f.ex. what about error checking?
+
 #if HAVE_PUTENV
         // this leaks, but what can we do about it?
         //   Is doing a getenv() and a free() of the older value 
@@ -332,6 +333,9 @@ bool PutEnv(string const & envstr)
         string varname;
         string str = envstr.split(varname,'=');
         int retval = setenv(varname.c_str(), str.c_str(), true);
+#else
+	// No environment setting function. Can this happen?
+	int retval = 1; //return an error condition.
 #endif
 #endif
         return retval == 0;