undo anything not wizard related in the previous merge-commit

32 files changed, 372 insertions, 458 deletions

diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst
index 4c62f004f0c9..4ca42cac8f80 100644
--- a/setup_native/prj/build.lst
+++ b/setup_native/prj/build.lst
@@ -4,7 +4,6 @@ pk  setup_native\scripts\source                           nmake   -  u   sn_sour
 pk  setup_native\scripts                                  nmake   -  u   sn_scripts sn_source.u NULL
 pk  setup_native\source\mac                               nmake   -  u   sn_mac NULL
 pk  setup_native\source\win32\customactions\tools         nmake   -  w   sn_tools NULL
-pk  setup_native\source\win32\customactions\relnotes      nmake   -  w   sn_relnotes NULL
 pk  setup_native\source\win32\customactions\rebase        nmake   -  w   sn_rebase NULL
 pk  setup_native\source\win32\customactions\regactivex    nmake   -  w   sn_regactivex NULL
 pk  setup_native\source\win32\customactions\regpatchactivex nmake -  w   sn_regpatchactivex NULL
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 358fce0f449d..6221f738c123 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -1,12 +1,12 @@
-mkdir: %_DEST%\bin%_EXT%\osl
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
+mkdir: %_DEST%\bin\osl
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\bin\*.exe %_DEST%\bin\*.exe
+..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
 
-mkdir: %_DEST%\bin%_EXT%\userscripts
-..\%__SRC%\bin\install %_DEST%\bin%_EXT%\userscripts\install
-..\%__SRC%\bin\uninstall %_DEST%\bin%_EXT%\userscripts\uninstall
-..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin%_EXT%\openoffice.org-userland-1.0-0.noarch.rpm
+mkdir: %_DEST%\bin\userscripts
+..\%__SRC%\bin\install %_DEST%\bin\userscripts\install
+..\%__SRC%\bin\uninstall %_DEST%\bin\userscripts\uninstall
+..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin\openoffice.org-userland-1.0-0.noarch.rpm
 
 mkdir: %_DEST%\bin\osolsmf
 ..\%__SRC%\bin\ulfconv %_DEST%\bin\ulfconv
@@ -48,6 +48,7 @@ mkdir: %_DEST%\bin\osolsmf
 ..\scripts\mac_install.script %_DEST%\bin\mac_install.script
 ..\scripts\osx_install_languagepack.applescript %_DEST%\bin\osx_install_languagepack.applescript
 ..\scripts\osx_install_patch.applescript %_DEST%\bin\osx_install_patch.applescript
-..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so
+
+..\%__SRC%\lib\getuid.so %_DEST%\bin\getuid.so
 
 ..\inc\setup_native\qswin32.h %_DEST%\inc\setup_native\qswin32.h
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store
index af137c0e6c41..9431578cebb3 100644
--- a/setup_native/source/mac/ooo/DS_Store
+++ b/setup_native/source/mac/ooo/DS_Store
diff --git a/setup_native/source/mac/ooo/DS_Store_Langpack b/setup_native/source/mac/ooo/DS_Store_Langpack
index 21b08ffb18cc..3a8ad71a5660 100644
--- a/setup_native/source/mac/ooo/DS_Store_Langpack
+++ b/setup_native/source/mac/ooo/DS_Store_Langpack
diff --git a/setup_native/source/mac/ooo3_installer.icns b/setup_native/source/mac/ooo3_installer.icns
index bacdd17d8470..45fca0fcaf80 100644
--- a/setup_native/source/mac/ooo3_installer.icns
+++ b/setup_native/source/mac/ooo3_installer.icns
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt
index 7d76ef7f95f6..d9948ca0c0c4 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -25,7 +25,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Presentation Minimizer extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -40,7 +40,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Report Builder extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -55,7 +55,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "MediaWiki publisher extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -70,7 +70,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Presenter Screen extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -85,7 +85,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "PDF import extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -101,7 +101,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Lightproof extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -116,7 +116,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Numbertext extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -131,7 +131,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Hungarian Cross-reference Toolbar extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -146,7 +146,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2010 by FSF.hu"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Typography Toolbar extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -161,7 +161,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "Copyright (c) 2008 Cor Nouws"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "ConvertTextToNumber extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -176,7 +176,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by Tibor Hornyák"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Watch Window extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -191,7 +191,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2010 by OxygenOffice Professional"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Diagram extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -206,7 +206,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2010 by OxygenOffice Professional"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Validator extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -221,7 +221,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2010 by EuroOffice Extension Creator"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Barcode extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -236,7 +236,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by Przemyslaw Rumik"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Google Docs extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -251,7 +251,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2009 by Sun Microsystems, Inc."
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "NLPSolver extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -266,7 +266,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2005-2009 by Daniel Naber"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "LanguageTool extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -281,7 +281,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2008 by Sun Mcrosystems, Inc."
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "MySQL Connector extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -296,7 +296,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "2005 by Caolan McNamara"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "oooblogger extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -311,7 +311,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Script provider for BeanShell extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -326,7 +326,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Script provider for JavaScript extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
@@ -341,7 +341,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Script provider for Python extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 588487ee41d0..3d0f68ab7663 100755
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -27,7 +27,7 @@ findrequires = "find-requires-gnome.sh"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Gnome integration module for LibreOffice %OOOBASEVERSION"
+description = "Gnome integration module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -42,7 +42,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "KDE integration module for LibreOffice %OOOBASEVERSION"
+description = "KDE integration module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -58,7 +58,7 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Core module for LibreOffice %OOOBASEVERSION"
+description = "Core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -74,7 +74,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Writer module for LibreOffice %OOOBASEVERSION"
+description = "Writer module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -90,7 +90,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Calc module for LibreOffice %OOOBASEVERSION"
+description = "Calc module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -106,7 +106,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Draw module for LibreOffice %OOOBASEVERSION"
+description = "Draw module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -122,7 +122,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
-description = "Impress module for LibreOffice %OOOBASEVERSION"
+description = "Impress module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -137,8 +137,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSIONg-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Base module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Base module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -153,8 +153,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Math module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Math module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -168,8 +168,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Legacy filters (e.g. StarOffice 5.2) for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -183,8 +183,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Graphic filter module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Graphic filter module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -198,8 +198,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Usage tracking module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Usage tracking module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -213,8 +213,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Testtool module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Testtool module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -228,8 +228,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "English spellchecker module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "English spellchecker module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -243,8 +243,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "XSLT filter samples module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "XSLT filter samples module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -258,8 +258,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Java filter module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Java filter module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -273,8 +273,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "ActiveX control for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "ActiveX control for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -288,7 +288,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
 vendor = "Oracle"
-description = "Online update modul for OpenOffice.org %OOOBASEVERSION"
+description = "Online update modul for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -302,8 +302,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Pyuno module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Pyuno module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -317,8 +317,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Email mailmerge module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Email mailmerge module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -332,8 +332,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Headless display module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Headless display module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -347,8 +347,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Images module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Images module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -362,8 +362,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Mailcap module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Mailcap module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -377,8 +377,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Linguistic module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Linguistic module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -393,8 +393,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -408,8 +408,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -424,8 +424,8 @@ findrequires = "find-requires-x11.sh"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -439,8 +439,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -454,8 +454,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -469,8 +469,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
 freebsdrequires = ""
 copyright = "1999-2009 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "Office core module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
@@ -1077,8 +1077,8 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
 requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
 copyright = "1999-2007 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
-description = "OpenGL slide transitions module for OpenOffice.org %OOOBASEVERSION"
+vendor = "The Document Foundation"
+description = "OpenGL slide transitions module for %PRODUCTNAME %OOOBASEVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt
index 859d1d6ec1cf..0e2e05c4d6b7 100755
--- a/setup_native/source/packinfo/packinfo_office_lang.txt
+++ b/setup_native/source/packinfo/packinfo_office_lang.txt
@@ -186,7 +186,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "SUN Template Pack (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
@@ -202,7 +202,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBAS
 linuxpatchrequires = ""
 copyright = "1999-2008 by OpenOffice.org"
 solariscopyright = "solariscopyrightfile"
-vendor = "OpenOffice.org"
+vendor = "The Document Foundation"
 description = "Lightproof (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
diff --git a/setup_native/source/packinfo/shellscripts_extensions.txt b/setup_native/source/packinfo/shellscripts_extensions.txt
index 0be870990b71..3ab47f925802 100755
--- a/setup_native/source/packinfo/shellscripts_extensions.txt
+++ b/setup_native/source/packinfo/shellscripts_extensions.txt
@@ -76,6 +76,12 @@ END
 
 if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then
   "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" sync 
+  if [ "$$?" != "0" ]; then
+    echo "ERROR: Registration of extensions failed!"
+    exit 1
+  else
+    echo "SUCCESS: unopkg returns successful!"
+  fi
   find "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \;
 fi
 
@@ -87,6 +93,12 @@ END
 
 if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then
   "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" sync 
+  if [ "$$?" != "0" ]; then
+    echo "ERROR: Registration of extensions failed!"
+    exit 1
+  else
+    echo "SUCCESS: unopkg returns successful!"
+  fi
   find "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \;
 fi
 
@@ -99,6 +111,12 @@ END
 
 if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ]; then
   "PRODUCTDIRECTORYNAME/program/unopkg" sync 
+  if [ "$$?" != "0" ]; then
+    echo "ERROR: Registration of extensions failed!"
+    exit 1
+  else
+    echo "SUCCESS: unopkg returns successful!"
+  fi
   find "PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \;
 fi
 
@@ -111,6 +129,12 @@ END
 if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ]
 then
   "PRODUCTDIRECTORYNAME/program/unopkg" sync 
+  if [ "$$?" != "0" ]; then
+    echo "ERROR: Registration of extensions failed!"
+    exit 1
+  else
+    echo "SUCCESS: unopkg returns successful!"
+  fi
  find "PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \;
 fi
 
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index f5344b9860ef..aa90dc53fe99 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -8,47 +8,47 @@
 # shall be included into the language pack, the keyword "EMPTY" can
 # be used as first entry.
 
-af = "af,en-US"
-ar = "EMPTY,en-US"
-ca = "ca,es,en-US,fr"
-cs = "cs,en-US"
-da = "da,de-DE,en-US"
-de = "de-DE,de-AT,de-CH,en-US,fr,it"
-en-US = "en-US,es,fr"
-en-GB = "en-US,es,fr"
-es = "es,en-US,fr,pt"
-et = "et,en-US"
-fr = "fr,en-US,es"
-gl = "gl,en-US,pt,es"
-he = "he,en-US"
-hu = "hu,de-DE,en-US"
-hr = "hr,de-DE,en-US"
-it = "it,de-DE,en-US,fr"
-ja = "EMPTY,en-US"
-ko = "EMPTY,en-US"
-ku = "ku-TR,en-US"
-lt = "lt,en-US"
-nb = "no,en-US,fr,de-DE,es"
-ne = "ne,en-US"
-nl = "nl,en-US,fr,de-DE"
-nn = "no,en-US,fr,de-DE,es"
-oc = "oc,fr,en-US"
-pl = "pl,de-DE,en-US,ru"
-pt-BR = "pt,en-US,es"
-pt = "pt,en-US,es"
-ro = "ro,en-US,de-DE,hu"
-ru = "ru,de-DE,en-US"
-sk = "sk,en-US"
-sl = "sl,en-US"
-sv = "sv,de-DE,en-US"
-sr = "sr,en-US"
+af = "af"
+ar = "EMPTY"
+ca = "ca,es,fr"
+cs = "cs"
+da = "da,de-DE"
+de = "de-DE,de-AT,de-CH,fr,it"
+en-US = "en,es,fr"
+en-GB = "en,es,fr"
+es = "es,fr,pt"
+et = "et"
+fr = "fr,es"
+gl = "gl,pt,es"
+he = "he"
+hu = "hu,de-DE"
+hr = "hr,de-DE"
+it = "it,de-DE,fr"
+ja = "EMPTY"
+ko = "EMPTY"
+ku = "ku-TR"
+lt = "lt"
+nb = "no,fr,de-DE,es"
+ne = "ne"
+nl = "nl,fr,de-DE"
+nn = "no,fr,de-DE,es"
+oc = "oc,fr"
+pl = "pl,de-DE,ru"
+pt-BR = "pt,es"
+pt = "pt,es"
+ro = "ro,de-DE,hu"
+ru = "ru,de-DE"
+sk = "sk"
+sl = "sl"
+sv = "sv,de-DE"
+sr = "sr"
 # ! Note the package 'sr' also holds the dictionaries for 'sh' !
-sh = "sr,en-US"
-sw = "sw,en-US"
-th = "th,en-US"
-uk = "uk,ru,en-US"
-vi = "vi,en-US,fr"
-zh-TW = "EMPTY,en-US"
-zh-CN = "EMPTY,en-US"
-zu = "zu,en-US"
+sh = "sr"
+sw = "sw"
+th = "th"
+uk = "uk,ru"
+vi = "vi,fr"
+zh-TW = "EMPTY"
+zh-CN = "EMPTY"
+zu = "zu"
 
diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk
index 3ee19cff53b4..3039ef4ccabd 100644
--- a/setup_native/source/win32/customactions/javafilter/makefile.mk
+++ b/setup_native/source/win32/customactions/javafilter/makefile.mk
@@ -40,7 +40,7 @@ DYNAMIC_CRT=
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 UWINAPILIB=
 
@@ -62,9 +62,9 @@ DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
 
 .ENDIF
+
 # --- Targets --------------------------------------------------------------
 
 .INCLUDE : target.mk
 
 # -------------------------------------------------------------------------
-
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index 365772ca8cd3..94eab3a0109c 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -44,7 +44,7 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 UWINAPILIB=
 
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 77cd11e0322c..641f48ab6e27 100755
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -43,7 +43,7 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 UWINAPILIB=
 
@@ -86,4 +86,3 @@ DEF1EXPORTFILE=exports.dxp
 .INCLUDE : target.mk
 
 # -------------------------------------------------------------------------
-
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk
index 870571578697..57b53d262ac7 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -45,7 +45,7 @@ UWINAPILIB=
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 STDSHL += \
     $(ADVAPI32LIB)\
@@ -91,4 +91,3 @@ DEF2EXPORTFILE=$(TARGET2).dxp
 .INCLUDE : target.mk
 
 # -------------------------------------------------------------------------
-
diff --git a/setup_native/source/win32/customactions/rebase/makefile.mk b/setup_native/source/win32/customactions/rebase/makefile.mk
index cb9e29db1e60..fb1fc22a8555 100644
--- a/setup_native/source/win32/customactions/rebase/makefile.mk
+++ b/setup_native/source/win32/customactions/rebase/makefile.mk
@@ -44,7 +44,7 @@ UWINAPILIB=
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 STDSHL += \
     $(ADVAPI32LIB)\
diff --git a/setup_native/source/win32/customactions/rebase/rebase.cxx b/setup_native/source/win32/customactions/rebase/rebase.cxx
index 1eb3fedbf2f0..ad3686c52b3d 100644
--- a/setup_native/source/win32/customactions/rebase/rebase.cxx
+++ b/setup_native/source/win32/customactions/rebase/rebase.cxx
@@ -20,11 +20,14 @@
 #include <malloc.h>
 #include <time.h>
 #include <string>
+#include <boost/unordered_map.hpp>
 
 const DWORD PE_Signature = 0x00004550;
+typedef std::pair< std::string, bool > StringPair;
+typedef boost::unordered_map< std::string, bool > ExcludeLibsMap;
 
 #ifdef DEBUG
-inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
+static void OutputDebugStringFormat( LPCSTR pFormat, ... )
 {
     CHAR    buffer[1024];
     va_list args;
@@ -34,7 +37,7 @@ inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
     OutputDebugStringA( buffer );
 }
 #else
-static inline void OutputDebugStringFormat( LPCSTR, ... )
+static void OutputDebugStringFormat( LPCSTR, ... )
 {
 }
 #endif
@@ -99,22 +102,31 @@ static BOOL rebaseImage( MSIHANDLE /*handle*/, const std::string& sFilePath, LPV
     return bResult;
 }
 
-static BOOL rebaseImagesInFolder( MSIHANDLE handle, const std::string& sPath, LPVOID address )
+static BOOL rebaseImagesInFolder( MSIHANDLE handle, const std::string& sPath, LPVOID address, ExcludeLibsMap& rExcludeMap )
 {
-    std::string   sDir     = sPath;
-    std::string   sPattern = sPath + TEXT("*.dll");
-
+    std::string     sDir     = sPath;
+    std::string     sPattern = sPath + TEXT("*.dll");
     WIN32_FIND_DATA aFindFileData;
-    HANDLE  hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
 
+    HANDLE hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
     if ( IsValidHandle(hFind) )
     {
         BOOL fSuccess = false;
 
         do
         {
-            std::string sLibFile = sDir + aFindFileData.cFileName;
-            rebaseImage( handle, sLibFile, address );
+            std::string sFileName = aFindFileData.cFileName;
+            if ( rExcludeMap.find( sFileName ) == rExcludeMap.end() )
+            {
+                OutputDebugStringFormat( "Rebase library: %s", sFileName.c_str() );
+                std::string sLibFile = sDir +  sFileName;
+                rebaseImage( handle, sLibFile, address );
+            }
+            else
+            {
+                OutputDebugStringFormat( "Exclude library %s from rebase", sFileName.c_str() );
+            }
+
             fSuccess = FindNextFile( hFind, &aFindFileData );
         }
         while ( fSuccess );
@@ -125,7 +137,7 @@ static BOOL rebaseImagesInFolder( MSIHANDLE handle, const std::string& sPath, LP
     return ERROR_SUCCESS;
 }
 
-static BOOL rebaseImages( MSIHANDLE handle, LPVOID pAddress )
+static BOOL rebaseImages( MSIHANDLE handle, LPVOID pAddress, ExcludeLibsMap& rMap )
 {
     std::string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
 
@@ -133,9 +145,9 @@ static BOOL rebaseImages( MSIHANDLE handle, LPVOID pAddress )
     std::string sOfficeDir = sInstallPath + TEXT("program\\");
     std::string sUreDir    = sInstallPath + TEXT("URE\\bin\\");
 
-    BOOL bResult = rebaseImagesInFolder( handle, sBasisDir, pAddress );
-    bResult &= rebaseImagesInFolder( handle, sOfficeDir, pAddress );
-    bResult &= rebaseImagesInFolder( handle, sUreDir, pAddress );
+    BOOL bResult = rebaseImagesInFolder( handle, sBasisDir, pAddress, rMap );
+    bResult &= rebaseImagesInFolder( handle, sOfficeDir, pAddress, rMap );
+    bResult &= rebaseImagesInFolder( handle, sUreDir, pAddress, rMap );
 
     return bResult;
 }
@@ -147,21 +159,66 @@ static BOOL IsServerSystem( MSIHANDLE /*handle*/ )
     GetVersionEx(reinterpret_cast<LPOSVERSIONINFO>(&osVersionInfoEx));
 
     if ( osVersionInfoEx.wProductType != VER_NT_WORKSTATION )
+    {
+        OutputDebugStringFormat( "Server system detected. No rebase necessary!" );
         return TRUE;
+    }
     else
+    {
+        OutputDebugStringFormat( "Client system detected. Rebase necessary!" );
         return FALSE;
+    }
+}
+
+static void InitExcludeFromRebaseList( MSIHANDLE handle, ExcludeLibsMap& rMap )
+{
+    size_t      nPos( 0 );
+    const TCHAR cDelim = ',';
+    std::string sLibsExcluded = GetMsiProperty(handle, TEXT("EXCLUDE_FROM_REBASE"));
+
+    while ( nPos < sLibsExcluded.size() )
+    {
+        size_t nDelPos = sLibsExcluded.find_first_of( cDelim, nPos );
+
+        std::string sExcludedLibName;
+        if ( nDelPos != std::string::npos )
+        {
+            sExcludedLibName = sLibsExcluded.substr( nPos, nDelPos - nPos );
+            nPos = nDelPos+1;
+        }
+        else
+        {
+            sExcludedLibName = sLibsExcluded.substr( nPos );
+            nPos = sLibsExcluded.size();
+        }
+
+        if ( sExcludedLibName.size() > 0 )
+        {
+            OutputDebugStringFormat( "Insert library %s into exclude from rebase list", sExcludedLibName.c_str() );
+            rMap.insert( StringPair( sExcludedLibName, true ));
+        }
+    }
 }
 
 extern "C" BOOL __stdcall RebaseLibrariesOnProperties( MSIHANDLE handle )
 {
     static LPVOID pDefault = reinterpret_cast<LPVOID>(0x10000000);
 
+    OutputDebugStringFormat( "RebaseLibrariesOnProperties has been called" );
     std::string sDontOptimizeLibs = GetMsiProperty(handle, TEXT("DONTOPTIMIZELIBS"));
     if ( sDontOptimizeLibs.length() > 0 && sDontOptimizeLibs == "1" )
+    {
+        OutputDebugStringFormat( "Don't optimize libraries set. No rebase necessary!" );
         return TRUE;
+    }
 
     if ( !IsServerSystem( handle ))
-        return rebaseImages( handle, pDefault );
+    {
+        ExcludeLibsMap aExcludeLibsMap;
+        InitExcludeFromRebaseList( handle, aExcludeLibsMap );
+
+        return rebaseImages( handle, pDefault, aExcludeLibsMap );
+    }
 
     return TRUE;
 }
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
index 24037f0c0c5b..0f162fa6cd9a 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -42,7 +42,7 @@ CFLAGS+=-DUNICODE -D_UNICODE
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 UWINAPILIB=
 
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
index 45fbed4819d2..5220b1ed6d0c 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
@@ -81,6 +81,14 @@ void Registrar::RegisterForMsWord() const
         RegistrationContextInformation::Writer);
 
     RegisterForMsOfficeApplication(
+        m_ContextInformation.GetMOOXWordDocumentFileExtension(),
+        m_ContextInformation.GetMOOXWordDocumentDisplayName(),
+        m_ContextInformation.GetWordDocumentDefaultIconEntry(),
+        m_ContextInformation.GetWordDocumentDefaultShellCommand(),
+        m_ContextInformation.ShellNewCommandDisplayName(),
+        RegistrationContextInformation::Writer);
+
+    RegisterForMsOfficeApplication(
         m_ContextInformation.GetWordTemplateFileExtension(),
         m_ContextInformation.GetWordTemplateDisplayName(),
         m_ContextInformation.GetWordTemplateDefaultIconEntry(),
@@ -114,6 +122,14 @@ void Registrar::UnregisterForMsWord() const
     try
     {
         UnregisterForMsOfficeApplication(
+            m_ContextInformation.GetMOOXWordDocumentFileExtension());
+    }
+    catch(RegistryKeyNotFoundException&)
+    {}
+
+    try
+    {
+        UnregisterForMsOfficeApplication(
             m_ContextInformation.GetWordTemplateFileExtension());
     }
     catch(RegistryKeyNotFoundException&)
@@ -192,6 +208,14 @@ void Registrar::RegisterForMsExcel() const
         RegistrationContextInformation::Calc);
 
     RegisterForMsOfficeApplication(
+        m_ContextInformation.GetMOOXExcelSheetFileExtension(),
+        m_ContextInformation.GetMOOXExcelSheetDisplayName(),
+        m_ContextInformation.GetExcelSheetDefaultIconEntry(),
+        m_ContextInformation.GetExcelSheetDefaultShellCommand(),
+        m_ContextInformation.ShellNewCommandDisplayName(),
+        RegistrationContextInformation::Calc);
+
+    RegisterForMsOfficeApplication(
         m_ContextInformation.GetExcelTemplateFileExtension(),
         m_ContextInformation.GetExcelTemplateDisplayName(),
         m_ContextInformation.GetExcelTemplateDefaultIconEntry(),
@@ -217,6 +241,22 @@ void Registrar::UnregisterForMsExcel() const
     try
     {
         UnregisterForMsOfficeApplication(
+            m_ContextInformation.GetMOOXExcelSheetFileExtension());
+    }
+    catch(RegistryKeyNotFoundException&)
+    {}
+
+    try
+    {
+        UnregisterForMsOfficeApplication(
+            m_ContextInformation.GetMOOXPowerPointDocumentFileExtension());
+    }
+    catch(RegistryKeyNotFoundException&)
+    {}
+
+    try
+    {
+        UnregisterForMsOfficeApplication(
             m_ContextInformation.GetExcelTemplateFileExtension());
     }
     catch(RegistryKeyNotFoundException&)
@@ -244,6 +284,14 @@ void Registrar::RegisterForMsPowerPoint() const
         RegistrationContextInformation::Impress);
 
     RegisterForMsOfficeApplication(
+        m_ContextInformation.GetMOOXPowerPointDocumentFileExtension(),
+        m_ContextInformation.GetMOOXPowerPointDocumentDisplayName(),
+        m_ContextInformation.GetPowerPointDocumentDefaultIconEntry(),
+        m_ContextInformation.GetPowerPointDocumentDefaultShellCommand(),
+        m_ContextInformation.ShellNewCommandDisplayName(),
+        RegistrationContextInformation::Impress);
+
+    RegisterForMsOfficeApplication(
         m_ContextInformation.GetPowerPointShowFileExtension(),
         m_ContextInformation.GetPowerPointShowDisplayName(),
         m_ContextInformation.GetPowerPointShowDefaultIconEntry(),
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
index f07c35a4d988..2f04d319dd80 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
@@ -53,6 +53,18 @@ std::wstring RegistrationContextInformation::GetWordDocumentDefaultShellCommand(
     return std::wstring(TEXT("open"));
 }
 
+std::wstring RegistrationContextInformation::GetMOOXWordDocumentDisplayName() const
+{
+    std::wstring str;
+    str = TEXT("Microsoft Word 2007 Document");
+    return str;
+}
+
+std::wstring RegistrationContextInformation::GetMOOXWordDocumentFileExtension() const
+{
+    return std::wstring(TEXT(".docx"));
+}
+
 std::wstring RegistrationContextInformation::GetWordTemplateDisplayName() const
 {
     std::wstring str;
@@ -125,6 +137,18 @@ std::wstring RegistrationContextInformation::GetExcelSheetDefaultShellCommand()
     return std::wstring(TEXT("open"));
 }
 
+std::wstring RegistrationContextInformation::GetMOOXExcelSheetDisplayName() const
+{
+    std::wstring str;
+    str = TEXT("Microsoft Excel 2007 Spreadsheet");
+    return str;
+}
+
+std::wstring RegistrationContextInformation::GetMOOXExcelSheetFileExtension() const
+{
+    return std::wstring(TEXT(".xlsx"));
+}
+
 std::wstring RegistrationContextInformation::GetExcelTemplateDisplayName() const
 {
     std::wstring str;
@@ -173,6 +197,18 @@ std::wstring RegistrationContextInformation::GetPowerPointDocumentDefaultShellCo
     return std::wstring(TEXT("open"));
 }
 
+std::wstring RegistrationContextInformation::GetMOOXPowerPointDocumentDisplayName() const
+{
+    std::wstring str;
+    str = TEXT("Microsoft PowerPoint 2007 Presentation");
+    return str;
+}
+
+std::wstring RegistrationContextInformation::GetMOOXPowerPointDocumentFileExtension() const
+{
+    return std::wstring(TEXT(".pptx"));
+}
+
 std::wstring RegistrationContextInformation::GetPowerPointTemplateDisplayName() const
 {
     std::wstring str;
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
index 91a42e6b58d7..d3297b14775c 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
@@ -47,6 +47,14 @@ public:
     std::wstring GetWordDocumentDefaultIconEntry() const;
     std::wstring GetWordDocumentDefaultShellCommand() const;
 
+    /** MOOX Word document information
+        The icon index is the index of the icon
+        in soffice.exe to be associated with
+        word document files
+    */
+    std::wstring GetMOOXWordDocumentDisplayName() const;
+    std::wstring GetMOOXWordDocumentFileExtension() const;
+
     /** Word template information
         The icon index is the index of the icon
         in soffice.exe to be associated with
@@ -77,6 +85,9 @@ public:
     std::wstring GetExcelSheetDefaultIconEntry() const;
     std::wstring GetExcelSheetDefaultShellCommand() const;
 
+    std::wstring GetMOOXExcelSheetDisplayName() const;
+    std::wstring GetMOOXExcelSheetFileExtension() const;
+
     /** Excel template information
         The icon index is the index of the icon
         in soffice.exe to be associated with
@@ -97,6 +108,9 @@ public:
     std::wstring GetPowerPointDocumentDefaultIconEntry() const;
     std::wstring GetPowerPointDocumentDefaultShellCommand() const;
 
+    std::wstring GetMOOXPowerPointDocumentDisplayName() const;
+    std::wstring GetMOOXPowerPointDocumentFileExtension() const;
+
     /** PowerPoint template information
         The icon index is the index of the icon
         in soffice.exe to be associated with
diff --git a/setup_native/source/win32/customactions/reg64/makefile.mk b/setup_native/source/win32/customactions/reg64/makefile.mk
index 4cb5a5ca20d0..a0d7fbaefc1f 100644
--- a/setup_native/source/win32/customactions/reg64/makefile.mk
+++ b/setup_native/source/win32/customactions/reg64/makefile.mk
@@ -44,7 +44,7 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 UWINAPILIB=
 
@@ -74,4 +74,3 @@ DEF1EXPORTFILE=exports.dxp
 
 .INCLUDE : target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk
index cc71dc39ada1..22eb1c89f7cd 100644
--- a/setup_native/source/win32/customactions/regactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regactivex/makefile.mk
@@ -40,7 +40,7 @@ USE_DEFFILE=TRUE
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 UWINAPILIB=
 
@@ -67,4 +67,3 @@ DEF1EXPORTFILE=exports.dxp
 .INCLUDE : target.mk
 
 # -------------------------------------------------------------------------
-
diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
index 4c6668db268c..9641c8ba018c 100644
--- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
@@ -30,14 +30,14 @@ PRJNAME=setup_native
 TARGET=regpatchactivex
 USE_DEFFILE=TRUE
 
-.IF "$(GUI)"=="WNT"
-
 # --- Settings -----------------------------------------------------
 
 ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE : settings.mk
 
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+
 STDSHL=
 
 # --- Files --------------------------------------------------------
@@ -78,12 +78,10 @@ SHL1BASE = 0x1c000000
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
 
+.ENDIF
+
 # --- Targets --------------------------------------------------------------
 
 .INCLUDE : target.mk
 
 # -------------------------------------------------------------------------
-
-
-.ENDIF
-
diff --git a/setup_native/source/win32/customactions/relnotes/exports.dxp b/setup_native/source/win32/customactions/relnotes/exports.dxp
deleted file mode 100644
index 55a454d3d58f..000000000000
--- a/setup_native/source/win32/customactions/relnotes/exports.dxp
+++ /dev/null
@@ -1,3 +0,0 @@
-ShowReleaseNotesBefore
-ShowReleaseNotesAfter
-ShowSurveyAfter
diff --git a/setup_native/source/win32/customactions/relnotes/makefile.mk b/setup_native/source/win32/customactions/relnotes/makefile.mk
deleted file mode 100644
index 526d45e71393..000000000000
--- a/setup_native/source/win32/customactions/relnotes/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-PRJNAME=setup_native
-TARGET=relnotes
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-NO_DEFAULT_STL=TRUE
-DYNAMIC_CRT=
-USE_DEFFILE=TRUE
-
-.INCLUDE : settings.mk
-
-CDEFS+=-DUNICODE
-
-UWINAPILIB=
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)"=="WNT"
-
-SLOFILES =	$(SLO)$/relnotes.obj
-
-STDSHL+=	\
-    $(ADVAPI32LIB)\
-    $(SHELL32LIB)\
-    $(MSILIB)
-
-SHL1LIBS = $(SLB)$/$(TARGET).lib 
-
-SHL1TARGET = $(TARGET)
-SHL1IMPLIB = i$(TARGET)
-
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-SHL1DEPN = $(SLB)$/$(TARGET).lib
-SHL1BASE = 0x1c000000
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-.ENDIF
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
-# -------------------------------------------------------------------------
-
-
diff --git a/setup_native/source/win32/customactions/relnotes/relnotes.cxx b/setup_native/source/win32/customactions/relnotes/relnotes.cxx
deleted file mode 100644
index 48aaf9b417bd..000000000000
--- a/setup_native/source/win32/customactions/relnotes/relnotes.cxx
+++ /dev/null
@@ -1,188 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#pragma warning(disable: 4917)
-#endif
-#include <windows.h>
-#include <msiquery.h>
-#include <shlobj.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <string.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <strsafe.h>
-#include <string>
-
-//----------------------------------------------------------
-#ifdef DEBUG
-inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
-{
-    TCHAR    buffer[1024];
-    va_list  args;
-
-    va_start( args, pFormat );
-    StringCchVPrintf( buffer, sizeof(buffer), pFormat, args );
-    OutputDebugString( buffer );
-}
-#else
-static inline void OutputDebugStringFormat( LPCTSTR, ... )
-{
-}
-#endif
-
-//----------------------------------------------------------
-inline bool IsValidHandle( HANDLE handle )
-{
-    return (NULL != handle) && (INVALID_HANDLE_VALUE != handle);
-}
-
-//----------------------------------------------------------
-static bool GetMsiProp(MSIHANDLE handle, LPCTSTR name, /*out*/std::wstring& value)
-{
-    DWORD sz = 0;
-    LPTSTR dummy = TEXT("");
-    if (MsiGetProperty(handle, name, dummy, &sz) == ERROR_MORE_DATA)
-    {
-        sz++;
-        DWORD nbytes = sz * sizeof(TCHAR);
-        LPTSTR buff = reinterpret_cast<LPTSTR>(_alloca(nbytes));
-        ZeroMemory(buff, nbytes);
-        MsiGetProperty(handle, name, buff, &sz);
-        value = buff;
-        return true;
-    }
-    return false;
-}
-
-//----------------------------------------------------------
-//----------------------------------------------------------
-//----------------------------------------------------------
-UINT ShowReleaseNotes( TCHAR* pFileName, TCHAR* pFilePath )
-{
-    TCHAR sFullPath[ MAX_PATH ];
-
-    if ( FAILED( StringCchCopy( sFullPath, MAX_PATH, pFilePath ) ) )
-    {
-        OutputDebugStringFormat( TEXT("DEBUG: ShowReleaseNotes: Could not copy path [%s]"), pFilePath );
-        return ERROR_SUCCESS;
-    }
-
-    if ( FAILED( StringCchCat( sFullPath, MAX_PATH, pFileName ) ) )
-    {
-        OutputDebugStringFormat( TEXT("DEBUG: ShowReleaseNotes: Could not append filename [%s]"), pFileName );
-        return ERROR_SUCCESS;
-    }
-
-    HANDLE hFile = CreateFile( sFullPath, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-    if ( IsValidHandle(hFile) )
-    {
-        CloseHandle( hFile );
-        OutputDebugStringFormat( TEXT("DEBUG: ShowReleaseNotes: Found file [%s]"), sFullPath );
-
-        SHELLEXECUTEINFOW aExecInf;
-        ZeroMemory( &aExecInf, sizeof( aExecInf ) );
-
-        aExecInf.cbSize = sizeof( aExecInf );
-        aExecInf.fMask  = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI;
-        aExecInf.lpVerb = TEXT("open");
-        aExecInf.lpFile = sFullPath;
-        aExecInf.lpDirectory = NULL;
-        aExecInf.nShow = SW_SHOWNORMAL;
-
-        SetLastError( 0 );
-        ShellExecuteEx( &aExecInf );
-    }
-    else
-    {
-        OutputDebugStringFormat( TEXT("DEBUG: ShowReleaseNotes: File not found [%s]"), sFullPath );
-    }
-
-    return ERROR_SUCCESS;
-}
-
-//----------------------------------------------------------
-extern "C" UINT __stdcall ShowReleaseNotesBefore( MSIHANDLE )
-{
-    TCHAR szPath[MAX_PATH];
-
-    if( FAILED( SHGetSpecialFolderPath( NULL, szPath, CSIDL_COMMON_DOCUMENTS, true ) ) )
-        return ERROR_SUCCESS;
-
-    OutputDebugString( TEXT("DEBUG: ShowReleaseNotesBefore called") );
-
-    return ShowReleaseNotes( TEXT("\\sun\\releasenote1.url"), szPath );
-}
-
-//----------------------------------------------------------
-extern "C" UINT __stdcall ShowReleaseNotesAfter( MSIHANDLE )
-{
-    TCHAR szPath[MAX_PATH];
-
-    if( FAILED( SHGetSpecialFolderPath( NULL, szPath, CSIDL_COMMON_DOCUMENTS, true ) ) )
-        return ERROR_SUCCESS;
-
-    OutputDebugString( TEXT("DEBUG: ShowReleaseNotesAfter called") );
-
-    return ShowReleaseNotes( TEXT("\\sun\\releasenote2.url"), szPath );
-}
-
-//----------------------------------------------------------
-extern "C" UINT __stdcall ShowSurveyAfter( MSIHANDLE handle )
-{
-    std::wstring prodname;
-
-    GetMsiProp( handle, TEXT("ProductName"), prodname );
-    std::wstring::size_type nIndex = prodname.find( TEXT( "OpenOffice.org" ) );
-    if( std::wstring::npos == nIndex )
-        return ERROR_SUCCESS;
-
-    OutputDebugString( TEXT("DEBUG: ShowSurveyAfter called") );
-
-    SHELLEXECUTEINFOW aExecInf;
-    ZeroMemory( &aExecInf, sizeof( aExecInf ) );
-
-    aExecInf.cbSize = sizeof( aExecInf );
-    aExecInf.fMask  = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI;
-    aExecInf.lpVerb = TEXT("open");
-    aExecInf.lpFile = TEXT("http://surveys.libreoffice.org/deinstall");
-    aExecInf.lpDirectory = NULL;
-    aExecInf.nShow = SW_SHOWNORMAL;
-
-    SetLastError( 0 );
-    ShellExecuteEx( &aExecInf );
-
-    return ERROR_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk b/setup_native/source/win32/customactions/sellang/makefile.mk
index a75c994fffc4..ffad814e3d74 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -31,8 +31,6 @@ PRJ=..$/..$/..$/..
 PRJNAME=setup_native
 TARGET=sellangmsi
 
-.IF "$(GUI)"=="WNT"
-
 # --- Settings -----------------------------------------------------
 
 ENABLE_EXCEPTIONS=TRUE
@@ -42,6 +40,8 @@ USE_DEFFILE=TRUE
 
 .INCLUDE : settings.mk
 
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+
 CFLAGS+=-D_STLP_USE_STATIC_LIB
 
 # --- Files --------------------------------------------------------
@@ -51,11 +51,12 @@ UWINAPILIB=
 SLOFILES = \
     $(SLO)$/sellang.obj
 
-SHL1STDLIBS=	kernel32.lib\
-                user32.lib\
-                advapi32.lib\
-                shell32.lib\
-                msi.lib
+SHL1STDLIBS= \
+    $(KERNEL32LIB)\
+    $(USER32LIB)\
+    $(ADVAPI32LIB)\
+    $(SHELL32LIB)\
+    $(MSILIB)
 
 SHL1LIBS = $(SLB)$/$(TARGET).lib
 
@@ -68,11 +69,10 @@ SHL1BASE = 0x1c000000
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
 
+.ENDIF
+
 # --- Targets --------------------------------------------------------------
 
 .INCLUDE : target.mk
 
 # -------------------------------------------------------------------------
-
-
-.ENDIF
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index de8f943320f0..e0950d992dc2 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -43,7 +43,7 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 UWINAPILIB=
 
@@ -96,5 +96,3 @@ DEF1EXPORTFILE=exports.dxp
 .INCLUDE : target.mk
 
 # -------------------------------------------------------------------------
-
-
diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index 53066682e397..28ea3998e76f 100644
--- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -198,13 +198,13 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
 
 extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle)
 {
-    std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
+    // std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
+    std::_tstring sInstDir = GetMsiProperty( handle, TEXT("CustomActionData") );
     std::_tstring sUnoPkgFile = sInstDir + TEXT("program\\unopkg.exe");
     std::_tstring mystr;
 
     WIN32_FIND_DATA aFindFileData;
-
-    mystr = "unopkg file: " + sUnoPkgFile;
+    bool registrationError = false;
 
     // Find unopkg.exe
     HANDLE hFindUnopkg = FindFirstFile( sUnoPkgFile.c_str(), &aFindFileData );
@@ -213,14 +213,27 @@ extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle)
     {
         // unopkg.exe exists in program directory
         std::_tstring sCommand = sUnoPkgFile + " sync";
-        mystr = "Command: " + sCommand;
 
         DWORD exitCode = 0;
-        ExecuteCommand( sCommand.c_str(), & exitCode);
+        bool fSuccess = ExecuteCommand( sCommand.c_str(), & exitCode);
+        if ( ! fSuccess )
+        {
+            mystr = "ERROR: An error occured during registration of extensions!";
+            MessageBox(NULL, mystr.c_str(), "ERROR", MB_OK);
+            registrationError = true;
+        }
+
         FindClose( hFindUnopkg );
     }
 
-    return ERROR_SUCCESS;
+    if ( registrationError )
+    {
+        return 1;
+    }
+    else
+    {
+        return ERROR_SUCCESS;
+    }
 }
 
 
diff --git a/setup_native/source/win32/customactions/thesaurus/makefile.mk b/setup_native/source/win32/customactions/thesaurus/makefile.mk
index c353341bf353..3041f87598ac 100755
--- a/setup_native/source/win32/customactions/thesaurus/makefile.mk
+++ b/setup_native/source/win32/customactions/thesaurus/makefile.mk
@@ -31,8 +31,6 @@ PRJ=..$/..$/..$/..
 PRJNAME=setup_native
 TARGET=thidxmsi
 
-.IF "$(GUI)"=="WNT"
-
 # --- Settings -----------------------------------------------------
 
 ENABLE_EXCEPTIONS=TRUE
@@ -42,6 +40,8 @@ USE_DEFFILE=TRUE
 
 .INCLUDE : settings.mk
 
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+
 CFLAGS+=-D_STLP_USE_STATIC_LIB
 
 # --- Files --------------------------------------------------------
@@ -68,11 +68,10 @@ SHL1BASE = 0x1c000000
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
 
+.ENDIF
+
 # --- Targets --------------------------------------------------------------
 
 .INCLUDE : target.mk
 
 # -------------------------------------------------------------------------
-
-
-.ENDIF
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index 24e14861b968..61c58036b9a8 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -41,7 +41,7 @@ USE_DEFFILE=TRUE
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
 UWINAPILIB=
 
@@ -70,5 +70,3 @@ DEF1EXPORTFILE=exports.dxp
 .INCLUDE : target.mk
 
 # -------------------------------------------------------------------------
-
-
diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt
index 26c1b03511da..ff3e9f372bec 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -88,7 +88,6 @@ nl    1252  1043
 nn    1252  2068
 no    1252  1044
 nr       0  1580   # Ndebele South
-ns       0  1132   # Northern Sotho (Sepedi)
 nso      0  1132
 ny       0  1598
 oc    1252  1154   # Occitan-lengadocian
@@ -135,6 +134,7 @@ ti-ER    0  1139   # Tigrinya
 tn       0  1074   # Setsuana
 tr    1254  1055   # Turkish
 ts       0  1073   # Tsonga
+tk       0  1090
 tt    1251  1092   # Tatar
 ug       0  2200
 uk    1251  1058   # Ukrainian