diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
index 9dea081b41c8..01cb0e41cd05 100644
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -77,6 +77,8 @@ APP1TARGET=	$(TARGET)
 APP1STACK=	1000000
 APP1OBJS=   $(OBJ)$/main.obj
 
+APP1RPATH=SDK
+
 .IF "$(GUI)"=="WNT"
 APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB)
 .ELSE
diff --git a/odk/configure.pl b/odk/configure.pl
index 7aef6d65acc9..2e6ebb7f053a 100644
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -521,8 +521,8 @@ print " * ... your SDK environment has been prepared.\n";
 print " * For each time you want to use this configured SDK environment, you\n";
 print " * have to run the \"setsdkenv_unix\" script file!\n";
 print " * Alternatively can you source one of the scripts\n";
-print " *   \"$main::OO_SDK_CONFIG_HOME/setsdkenv_unix.sh\"\n";
-print " *   \"$main::OO_SDK_CONFIG_HOME/setsdkenv_unix.csh\"\n";
+print " *   \"$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.sh\"\n";
+print " *   \"$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.csh\"\n";
 print " * to get an environment without starting a new shell.\n";
 print " ************************************************************************\n\n";
 
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 3e352f987767..33271ea10d41 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -51,6 +51,19 @@
 			  comes with the office installation and can be found in the program
 			  directory of the office installation.</td>
             </tr>
+           <tr valign="top">
+              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <td><a href="#regmerge"  title="link to the regmerge tool description">regmerge</a></td>
+              <td class="content87">Tool to merge several registry (e.g. type 
+			  libraries) files into one file. <b>Note:</b> Since OpenOffice.org 3 it is not longer part of the SDK but it comes directly with the office as part of the <b>ure</b>.</td>
+            </tr>
+            <tr valign="top">
+              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <td><a href="#regview"  title="link to the regview tool description">regview</a></td>
+              <td class="content87">Tool to view the content of a registry file 
+			  in a human readable manner. Special support for type library 
+			  nodes. <b>Note:</b> Since OpenOffice.org 3 it is not longer part of the SDK but it comes directly with the office as part of the <b>ure</b>.</td>
+            </tr>
             <tr valign="middle"> 
               <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
             </tr>
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index ccec4721a66e..49dce9f36951 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -55,8 +55,6 @@ IDL_SINCE_TAGS=apiref-autodoc.since
 EXELIST = \
     $(DESTDIRBIN)$/cppumaker$(EXEPOSTFIX) 	\
     $(DESTDIRBIN)$/regcompare$(EXEPOSTFIX) 	\
-    $(DESTDIRBIN)$/regmerge$(EXEPOSTFIX) 	\
-    $(DESTDIRBIN)$/regview$(EXEPOSTFIX) 	\
     $(DESTDIRBIN)$/idlcpp$(EXEPOSTFIX) 	\
     $(DESTDIRBIN)$/idlc$(EXEPOSTFIX) 	\
     $(DESTDIRBIN)$/javamaker$(EXEPOSTFIX) 	\
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 5ed45518160a..4a13cd706bb6 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -48,7 +48,7 @@ if (-d "$StartDir") {
     print "check binaries: ";
     if (-d "$StartDir/bin") {
     my @binarylist = ( "idlc","idlcpp","cppumaker","javamaker",
-               "regcompare","regmerge","regview","autodoc",
+               "regcompare","autodoc",
                "unoapploader", "uno-skeletonmaker" );
 
     foreach $i (@binarylist)