sb126: merged in DEV300_m84

40 files changed, 2060 insertions, 1692 deletions

diff --git a/configure b/configure
index 59d81d6de..997139fdc 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_MDDS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB MYTHES_CFLAGS MYTHES_LIBS SYSTEM_MYTHES SYSTEM_LPSOLVE HAVE_GETOPT HAVE_READDIR_R SYSTEM_LIBC PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE nodep LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1050,6 +1050,8 @@ Optional Features:
   --enable-verbose        Increase build verbosity.
   --disable-verbose       Decrease build verbosity.
 
+  --disable-dependency-tracking  Disables generation of dependency information.
+
   --disable-largefile     omit support for large files
 
 Optional Packages:
@@ -1220,6 +1222,8 @@ Optional Packages:
 
   --with-system-boost     Use boost already on system
 
+  --with-system-mdds      Use mdds already on system
+
   --with-system-vigra     Use vigra already on system
 
   --with-system-neon      Use neon already on system
@@ -2043,8 +2047,6 @@ fi;
 if test "${with_system_stdlibs+set}" = set; then
   withval="$with_system_stdlibs"
 
-else
-  checkforstdlibproblems=yes
 fi;
 # Check whether --enable-cups or --disable-cups was given.
 if test "${enable_cups+set}" = set; then
@@ -2659,6 +2661,12 @@ if test "${with_system_boost+set}" = set; then
 
 fi;
 
+# Check whether --with-system-mdds or --without-system-mdds was given.
+if test "${with_system_mdds+set}" = set; then
+  withval="$with_system_mdds"
+
+fi;
+
 # Check whether --with-system-vigra or --without-system-vigra was given.
 if test "${with_system_vigra+set}" = set; then
   withval="$with_system_vigra"
@@ -2952,6 +2960,11 @@ if test "${enable_verbose+set}" = set; then
   enableval="$enable_verbose"
 
 fi;
+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval="$enable_dependency_tracking"
+
+fi;
 
 BUILD_TYPE="OOo"
 
@@ -12729,22 +12742,6 @@ fi
 
 
 
-if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
-  if test -n "$checkforstdlibproblems"; then
-    if test -f /etc/rpm/macros.prelink; then
-      with_system_stdlibs=yes
-      { echo "$as_me:$LINENO: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
-echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;}
-      echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
-    elif test "$GCC" = "yes" -a ! -e `$CC -print-file-name=libgcc_s.so.1`; then
-      with_system_stdlibs=yes
-      { echo "$as_me:$LINENO: WARNING: platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5
-echo "$as_me: WARNING: platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;}
-      echo "platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
-    fi
-  fi
-fi
-
 echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5
 echo $ECHO_N "checking whether to provide libstdc++/libgcc_s in the installset... $ECHO_C" >&6
 if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \
@@ -15962,6 +15959,179 @@ fi
 
 
 
+echo "$as_me:$LINENO: checking which mdds to use" >&5
+echo $ECHO_N "checking which mdds to use... $ECHO_C" >&6
+if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
+	test "$with_system_mdds" != "no"; then
+    echo "$as_me:$LINENO: result: external" >&5
+echo "${ECHO_T}external" >&6
+    SYSTEM_MDDS=YES
+    ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+    if test "${ac_cv_header_mdds_flat_segment_tree_hpp+set}" = set; then
+  echo "$as_me:$LINENO: checking for mdds/flat_segment_tree.hpp" >&5
+echo $ECHO_N "checking for mdds/flat_segment_tree.hpp... $ECHO_C" >&6
+if test "${ac_cv_header_mdds_flat_segment_tree_hpp+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_mdds_flat_segment_tree_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_mdds_flat_segment_tree_hpp" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking mdds/flat_segment_tree.hpp usability" >&5
+echo $ECHO_N "checking mdds/flat_segment_tree.hpp usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <mdds/flat_segment_tree.hpp>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking mdds/flat_segment_tree.hpp presence" >&5
+echo $ECHO_N "checking mdds/flat_segment_tree.hpp presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <mdds/flat_segment_tree.hpp>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: present but cannot be compiled" >&5
+echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: mdds/flat_segment_tree.hpp:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: mdds/flat_segment_tree.hpp:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for mdds/flat_segment_tree.hpp" >&5
+echo $ECHO_N "checking for mdds/flat_segment_tree.hpp... $ECHO_C" >&6
+if test "${ac_cv_header_mdds_flat_segment_tree_hpp+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_mdds_flat_segment_tree_hpp=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_mdds_flat_segment_tree_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_mdds_flat_segment_tree_hpp" >&6
+
+fi
+if test $ac_cv_header_mdds_flat_segment_tree_hpp = yes; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: mdds/flat_segment_tree.hpp not found. install mdds" >&5
+echo "$as_me: error: mdds/flat_segment_tree.hpp not found. install mdds" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+else
+   echo "$as_me:$LINENO: result: internal" >&5
+echo "${ECHO_T}internal" >&6
+   BUILD_TYPE="$BUILD_TYPE MDDS"
+   SYSTEM_MDDS=NO
+fi
+
+
 echo "$as_me:$LINENO: checking which boost to use" >&5
 echo $ECHO_N "checking which boost to use... $ECHO_C" >&6
 if test -n "$with_system_boost" -o -n "$with_system_headers" && \
@@ -23460,7 +23630,110 @@ if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
     echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
     SYSTEM_MYTHES=YES
-    if test "${ac_cv_header_mythes_hxx+set}" = set; then
+    ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for mythes" >&5
+echo $ECHO_N "checking for mythes... $ECHO_C" >&6
+
+        if $PKG_CONFIG --exists "mythes" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
+
+            echo "$as_me:$LINENO: checking MYTHES_CFLAGS" >&5
+echo $ECHO_N "checking MYTHES_CFLAGS... $ECHO_C" >&6
+            MYTHES_CFLAGS=`$PKG_CONFIG --cflags "mythes"`
+            echo "$as_me:$LINENO: result: $MYTHES_CFLAGS" >&5
+echo "${ECHO_T}$MYTHES_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking MYTHES_LIBS" >&5
+echo $ECHO_N "checking MYTHES_LIBS... $ECHO_C" >&6
+            MYTHES_LIBS=`$PKG_CONFIG --libs "mythes"`
+            echo "$as_me:$LINENO: result: $MYTHES_LIBS" >&5
+echo "${ECHO_T}$MYTHES_LIBS" >&6
+        else
+            MYTHES_CFLAGS=""
+            MYTHES_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            MYTHES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mythes"`
+
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     MYTHES_PKGCONFIG=yes
+  else
+     MYTHES_PKGCONFIG=no
+  fi
+
+    if test "$MYTHES_PKGCONFIG" = "no"; then
+        if test "${ac_cv_header_mythes_hxx+set}" = set; then
   echo "$as_me:$LINENO: checking for mythes.hxx" >&5
 echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6
 if test "${ac_cv_header_mythes_hxx+set}" = set; then
@@ -23490,7 +23763,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 { ac_try='test -z "$ac_cxx_werror_flag"
 			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
@@ -23534,8 +23807,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
   else
     ac_cpp_err=
   fi
@@ -23555,7 +23828,7 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 echo "${ECHO_T}$ac_header_preproc" >&6
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
     { echo "$as_me:$LINENO: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -23607,7 +23880,77 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking for main in -lmythes" >&5
+echo "$as_me:$LINENO: checking for main in -lmythes-1.2" >&5
+echo $ECHO_N "checking for main in -lmythes-1.2... $ECHO_C" >&6
+if test "${ac_cv_lib_mythes_1_2_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmythes-1.2  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_mythes_1_2_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_mythes_1_2_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_1_2_main" >&5
+echo "${ECHO_T}$ac_cv_lib_mythes_1_2_main" >&6
+if test $ac_cv_lib_mythes_1_2_main = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMYTHES_1_2 1
+_ACEOF
+
+  LIBS="-lmythes-1.2 $LIBS"
+
+else
+   MYTHES_FOUND=no
+fi
+
+ 	if test "$MYTHES_FOUND" = "no"; then
+            echo "$as_me:$LINENO: checking for main in -lmythes" >&5
 echo $ECHO_N "checking for main in -lmythes... $ECHO_C" >&6
 if test "${ac_cv_lib_mythes_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23639,7 +23982,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 { ac_try='test -z "$ac_cxx_werror_flag"
 			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
@@ -23666,25 +24009,34 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5
 echo "${ECHO_T}$ac_cv_lib_mythes_main" >&6
 if test $ac_cv_lib_mythes_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMYTHES 1
-_ACEOF
-
-  LIBS="-lmythes $LIBS"
-
+  MYTHES_FOUND=yes
 else
-   { { echo "$as_me:$LINENO: error: mythes library not found." >&5
-echo "$as_me: error: mythes library not found." >&2;}
-   { (exit 1); exit 1; }; }
+   MYTHES_FOUND=no
 fi
 
+	fi
+	if test "$MYTHES_FOUND" = "no"; then
+		{ { echo "$as_me:$LINENO: error: mythes library not found!." >&5
+echo "$as_me: error: mythes library not found!." >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+    fi
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 else
     echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
     SYSTEM_MYTHES=NO
+    BUILD_TYPE="$BUILD_TYPE MYTHES"
 fi
 
 
+
+
 echo "$as_me:$LINENO: checking which lpsolve to use" >&5
 echo $ECHO_N "checking which lpsolve to use... $ECHO_C" >&6
 if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
@@ -24007,6 +24359,227 @@ echo "$as_me: error: no, upgrade libc" >&2;}
    fi
 fi
 
+if test "$_os" != "WNT"; then
+
+for ac_func in getopt
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ HAVE_GETOPT=YES
+else
+  HAVE_GETOPT=NO
+fi
+done
+
+
+for ac_func in readdir_r
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ HAVE_READDIR_R=YES
+else
+  HAVE_READDIR_R=NO
+fi
+done
+
+  if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
+	SYSTEM_LIBC=YES
+  fi
+else
+  HAVE_GETOPT=NO
+  HAVE_READDIR_R=NO
+  SYSTEM_LIBC=YES
+fi
+
+
+
+
 if test \( "$_os" = "WINNT" \) ; then
 	echo "$as_me:$LINENO: checking for PSDK files" >&5
 echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6
@@ -28880,6 +29453,18 @@ echo "${ECHO_T}not set" >&6
 fi
 
 
+echo "$as_me:$LINENO: checking whether to enable dependency tracking" >&5
+echo $ECHO_N "checking whether to enable dependency tracking... $ECHO_C" >&6
+if test "$enable_dependency_tracking" = "no"; then
+    nodep=TRUE
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+fi
+
+
 echo "********************************************************************"
 echo "*                                                                  *"
 echo "*   Setting up the build environment variables.                    *"
@@ -29736,6 +30321,7 @@ s,@CURLCONFIG@,$CURLCONFIG,;t t
 s,@SYSTEM_CURL@,$SYSTEM_CURL,;t t
 s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t
 s,@CURL_LIBS@,$CURL_LIBS,;t t
+s,@SYSTEM_MDDS@,$SYSTEM_MDDS,;t t
 s,@SYSTEM_BOOST@,$SYSTEM_BOOST,;t t
 s,@SYSTEM_VIGRA@,$SYSTEM_VIGRA,;t t
 s,@SYSTEM_ODBC_HEADERS@,$SYSTEM_ODBC_HEADERS,;t t
@@ -29809,8 +30395,13 @@ s,@HUNSPELL_LIBS@,$HUNSPELL_LIBS,;t t
 s,@SYSTEM_HUNSPELL@,$SYSTEM_HUNSPELL,;t t
 s,@SYSTEM_HYPH@,$SYSTEM_HYPH,;t t
 s,@HYPHEN_LIB@,$HYPHEN_LIB,;t t
+s,@MYTHES_CFLAGS@,$MYTHES_CFLAGS,;t t
+s,@MYTHES_LIBS@,$MYTHES_LIBS,;t t
 s,@SYSTEM_MYTHES@,$SYSTEM_MYTHES,;t t
 s,@SYSTEM_LPSOLVE@,$SYSTEM_LPSOLVE,;t t
+s,@HAVE_GETOPT@,$HAVE_GETOPT,;t t
+s,@HAVE_READDIR_R@,$HAVE_READDIR_R,;t t
+s,@SYSTEM_LIBC@,$SYSTEM_LIBC,;t t
 s,@PSDK_HOME@,$PSDK_HOME,;t t
 s,@WINDOWS_VISTA_PSDK@,$WINDOWS_VISTA_PSDK,;t t
 s,@DIRECTXSDK_HOME@,$DIRECTXSDK_HOME,;t t
@@ -29910,6 +30501,7 @@ s,@UNIXWRAPPERNAME@,$UNIXWRAPPERNAME,;t t
 s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t
 s,@ENABLE_LAYOUT@,$ENABLE_LAYOUT,;t t
 s,@VERBOSE@,$VERBOSE,;t t
+s,@nodep@,$nodep,;t t
 s,@LOCAL_SOLVER@,$LOCAL_SOLVER,;t t
 s,@BUILD_TYPE@,$BUILD_TYPE,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
diff --git a/configure.in b/configure.in
index 0f658c8cb..00a5d5dde 100644
--- a/configure.in
+++ b/configure.in
@@ -129,7 +129,7 @@ AC_ARG_ENABLE(evolution2,
 ],,)
 AC_ARG_WITH(system-stdlibs,
 [  --with-system-stdlibs   use libstdc++/libgcc_s already on system
-],,checkforstdlibproblems=yes)
+],,)
 AC_ARG_ENABLE(cups,
 [  --disable-cups          disable cups support in the psprint project
 ],,enable_cups=yes)
@@ -515,6 +515,9 @@ AC_ARG_WITH(system-curl,
 AC_ARG_WITH(system-boost,
 [  --with-system-boost     Use boost already on system
 ],,)
+AC_ARG_WITH(system-mdds,
+[  --with-system-mdds      Use mdds already on system
+],,)
 AC_ARG_WITH(system-vigra,
 [  --with-system-vigra     Use vigra already on system
 ],,)
@@ -813,6 +816,9 @@ AC_ARG_ENABLE(verbose,
 [  --enable-verbose        Increase build verbosity.
   --disable-verbose       Decrease build verbosity.
 ],,)
+AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  Disables generation of dependency information.
+],,)
 
 BUILD_TYPE="OOo"
 
@@ -3498,23 +3504,6 @@ AC_SUBST(MINGWCXX)
 AC_SUBST(MINGWSTRIP)
 
 dnl ===================================================================
-dnl Check for prelinked libgcc_s.so.1
-dnl ===================================================================
-if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
-  if test -n "$checkforstdlibproblems"; then
-    if test -f /etc/rpm/macros.prelink; then
-      with_system_stdlibs=yes
-      AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
-      echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
-    elif test "$GCC" = "yes" -a ! -e `$CC -print-file-name=libgcc_s.so.1`; then
-      with_system_stdlibs=yes
-      AC_MSG_WARN([platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
-      echo "platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
-    fi
-  fi
-fi
-
-dnl ===================================================================
 dnl Check for system stdlibs
 dnl ===================================================================
 AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset])
@@ -4192,6 +4181,25 @@ AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
 
 dnl ===================================================================
+dnl Check for system mdds
+dnl ===================================================================
+AC_MSG_CHECKING([which mdds to use])
+if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
+	test "$with_system_mdds" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_MDDS=YES
+    AC_LANG_PUSH([C++])
+    AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [],
+        [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], [])
+    AC_LANG_POP([C++])
+else
+   AC_MSG_RESULT([internal])
+   BUILD_TYPE="$BUILD_TYPE MDDS"
+   SYSTEM_MDDS=NO
+fi
+AC_SUBST(SYSTEM_MDDS)
+
+dnl ===================================================================
 dnl Check for system boost
 dnl ===================================================================
 AC_MSG_CHECKING([which boost to use])
@@ -5090,15 +5098,30 @@ AC_MSG_CHECKING([which mythes to use])
 if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_MYTHES=YES
-    AC_CHECK_HEADER(mythes.hxx, [],
-       [ AC_MSG_ERROR(mythes.hxx headers not found.)], [])
-    AC_CHECK_LIB(mythes, main, [],
-        [ AC_MSG_ERROR(mythes library not found.)], [])
+    AC_LANG_PUSH([C++])
+    PKG_CHECK_MODULES(MYTHES, mythes, MYTHES_PKGCONFIG=yes, MYTHES_PKGCONFIG=no)
+    if test "$MYTHES_PKGCONFIG" = "no"; then
+        AC_CHECK_HEADER(mythes.hxx, [],
+            [ AC_MSG_ERROR(mythes.hxx headers not found.)], [])
+        AC_CHECK_LIB(mythes-1.2, main, [],
+            [ MYTHES_FOUND=no], [])
+ 	if test "$MYTHES_FOUND" = "no"; then
+            AC_CHECK_LIB(mythes, main, [MYTHES_FOUND=yes],
+                [ MYTHES_FOUND=no], [])
+	fi
+	if test "$MYTHES_FOUND" = "no"; then
+		AC_MSG_ERROR([mythes library not found!.])
+	fi
+    fi
+    AC_LANG_POP([C++])
 else
     AC_MSG_RESULT([internal])
     SYSTEM_MYTHES=NO
+    BUILD_TYPE="$BUILD_TYPE MYTHES"
 fi
 AC_SUBST(SYSTEM_MYTHES)
+AC_SUBST(MYTHES_CFLAGS)
+AC_SUBST(MYTHES_LIBS)
 
 dnl ===================================================================
 dnl Checking for lpsolve
@@ -5134,6 +5157,21 @@ if test "$_os" = "Linux"; then
    fi
 fi
 
+if test "$_os" != "WNT"; then
+  AC_CHECK_FUNCS(getopt, HAVE_GETOPT=YES, [HAVE_GETOPT=NO])
+  AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO])
+  if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
+	SYSTEM_LIBC=YES
+  fi
+else
+  HAVE_GETOPT=NO
+  HAVE_READDIR_R=NO
+  SYSTEM_LIBC=YES
+fi
+AC_SUBST(HAVE_GETOPT)
+AC_SUBST(HAVE_READDIR_R)
+AC_SUBST(SYSTEM_LIBC)
+
 dnl =========================================
 dnl Check for the Microsoft Platform SDK.
 dnl =========================================
@@ -6868,6 +6906,19 @@ fi
 AC_SUBST(VERBOSE)
 
 dnl ===================================================================
+dnl Hook up OOos nodep environmental variable to automake's equivalent
+dnl --enable-dependency-tracking configure option
+dnl ===================================================================
+AC_MSG_CHECKING([whether to enable dependency tracking])
+if test "$enable_dependency_tracking" = "no"; then
+    nodep=TRUE
+    AC_MSG_RESULT([no])
+else
+    AC_MSG_RESULT([yes])
+fi
+AC_SUBST(nodep)
+
+dnl ===================================================================
 dnl Setting up the environment.
 dnl ===================================================================
 echo "********************************************************************"
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 885fba224..72f4262b1 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -172,6 +172,7 @@ ADDDEPS+=hack_msitemplates
 .ENDIF
 
 $(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS)
+openoffice_$(defaultlangiso).archive : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) openofficedev_$i) : $(ADDDEPS)
 
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 5fb95b482..221aee986 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -100,6 +100,7 @@ OpenOffice
             STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
+            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
 		active			1
 		compression		5
@@ -165,6 +166,7 @@ OpenOffice_wJRE
             STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
+            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
 		active			1
 		compression		5
@@ -236,6 +238,7 @@ OpenOffice_Dev
             STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
+            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
 		active			1
 		compression		5
@@ -279,6 +282,7 @@ URE
             STARTCENTER_LAYOUT_STYLE 0
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
 			PACKAGEMAP package_names_ext.txt
+            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
         }
         active 1
         compression 5
@@ -323,6 +327,7 @@ OpenOffice_SDK
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
+            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
         }
         active 1
         compression 5
@@ -374,6 +379,7 @@ OpenOffice_Dev_SDK
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
+            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
         }
         active 1
         compression 5
@@ -441,6 +447,7 @@ BrOffice
             STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
+            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
 		active			1
 		compression		5
@@ -512,6 +519,7 @@ BrOffice_wJRE
             STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
+            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
 		active			1
 		compression		5
@@ -583,6 +591,7 @@ BrOffice_Dev
             STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
+            DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
 		}
 		active			1
 		compression		5
diff --git a/ooo.lst b/ooo.lst
index d2f92d6ef..0887e5981 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -71,3 +71,5 @@ fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz
 fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 fe5b3e2b7c4577f30dc001054365653e-dejavu-fonts-ttf-2.30.zip
 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
+067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
+cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6558dd1a5..f505a886c 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -43,7 +43,6 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_C05_Faq,
             gid_Brand_Dir_Share_Config,
             gid_Brand_Dir_Share_Extension,
-            gid_Brand_Dir_Share_Extension_Install,
             gid_Brand_Dir_Share_Uno_Packages,
             gid_Brand_Dir_Share_Uno_Packages_Cache,
             gid_Brand_Dir_Share_Registry,
@@ -80,6 +79,8 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Lib_Msvcr80,
              gid_Brand_File_Lib_Msvcp80,
              gid_Brand_File_Lib_Msvcm80,
+			 gid_Brand_File_Lib_Oirm,
+			 gid_Brand_File_Lib_Oirm2,
              gid_Brand_File_Msvcm80crt_Manifest,
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
@@ -91,9 +92,11 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Xdg_Draw,
              gid_Brand_File_Share_Xdg_Extension,
              gid_Brand_File_Share_Xdg_Impress,
+             gid_Brand_File_Share_Xdg_JavaFilter,
              gid_Brand_File_Share_Xdg_Math,
              gid_Brand_File_Share_Xdg_Printeradmin,
              gid_Brand_File_Share_Xdg_QStart,
+             gid_Brand_File_Share_Xdg_StartCenter,
              gid_Brand_File_Share_Xdg_Writer);
     Unixlinks = (gid_Brand_Unixlink_BasisLink,
                  gid_Brand_Unixlink_Program,
@@ -119,6 +122,7 @@ Module gid_Module_Langpack_Brand_Template
             gid_Brand_Dir_Share_Readme);
     Files = (gid_Brand_File_Res_Iso,
              gid_Brand_File_Res_Ooo,
+             gid_Brand_File_Res_Oirm,
              gid_Brand_File_Help_C05_Sdatabase_Zip,
              gid_Brand_File_Help_C05_Scalc_Zip,
              gid_Brand_File_Help_C05_Sdraw_Zip,
@@ -212,10 +216,179 @@ Directory gid_Brand_Dir_Share_Extension
     DosName = "extension";
 End
 
-Directory gid_Brand_Dir_Share_Extension_Install
+Directory gid_Brand_Dir_Share_Extensions
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "extensions";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Install
     ParentID = gid_Brand_Dir_Share_Extension;
     DosName = "install";
-    Styles = (CREATE);
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Af
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-af";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ca
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ca";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Cs
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-cs";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Da
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-da";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_De_At
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-de-AT";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_De_Ch
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-de-CH";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_De_De
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-de-DE";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_En
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-en";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Es
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-es";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Et
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-et";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Fr
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-fr";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Gl
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-gl";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_He
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-he";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Hu
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-hu";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_It
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-it";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ku-TR";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Lt
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-lt";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ne
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ne";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Nl
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-nl";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_No
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-no";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Pl
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-pl";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Pt
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-pt";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ro
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ro";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ru
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ru";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Sk
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-sk";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Sl
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-sl";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Sr
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-sr";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Sv
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-sv";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Sw
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-sw";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Th
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-th";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Vi
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-vi";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Zu
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-zu";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Oooimprovement
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "OOoImprovement";
 End
 
 Directory gid_Brand_Dir_Share_Uno_Packages
@@ -569,6 +742,25 @@ File gid_Brand_File_Share_Xdg_Writer
 End
 #endif
 
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_StartCenter
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "startcenter.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_JavaFilter
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "javafilter.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+
 #if defined WNT && defined(_gcc3)
 File gid_Brand_File_Lib_Mingwm10
     BIN_FILE_BODY;
@@ -1025,6 +1217,22 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ooo_Base_Dir
 #endif
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS_USER";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS_USER}";
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1033,6 +1241,14 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
     Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":UNO_SHARED_PACKAGES_CACHE}";
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "SHARED_EXTENSIONS_USER";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":SHARED_EXTENSIONS_USER}";
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1041,6 +1257,14 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
     Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":UNO_USER_PACKAGES_CACHE}";
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "TMP_EXTENSIONS";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":TMP_EXTENSIONS}";
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 81ee4eac2..a600c135d 100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1870,288 +1870,288 @@ End
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Af
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Af;
 	Name = "dict-af.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ca
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca;
     Name = "dict-ca.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Cs
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Cs;
 	Name = "dict-cs.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Da
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Da;
 	Name = "dict-da.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_De_AT
-	Dir = gid_Brand_Dir_Share_Extension_Install;
-    Name = "dict-de-AT.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_De_At;
+	Name = "dict-de-AT.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_De_CH
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_Ch;
     Name = "dict-de-CH.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_De_DE
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_De;
     Name = "dict-de-DE.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_En
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_En;
 	Name = "dict-en.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Es
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Es;
 	Name = "dict-es.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Et
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Et;
 	Name = "dict-et.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Fr
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Fr;
 	Name = "dict-fr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Gl
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl;
 	Name = "dict-gl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_He
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_He;
     Name = "dict-he.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Hu
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hu;
 	Name = "dict-hu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_It
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_It;
 	Name = "dict-it.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ku_Tr
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr;
 	Name = "dict-ku-TR.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Lt
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Lt;
 	Name = "dict-lt.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ne
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ne;
 	Name = "dict-ne.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Nl
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Nl;
 	Name = "dict-nl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_No
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_No;
     Name = "dict-no.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Pl
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pl;
 	Name = "dict-pl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Pt
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt;
 	Name = "dict-pt.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ro
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_Ro;
     Name = "dict-ro.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ru
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ru;
 	Name = "dict-ru.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sk
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sk;
 	Name = "dict-sk.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sl
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sl;
 	Name = "dict-sl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sr
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sr;
 	Name = "dict-sr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sv
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sv;
 	Name = "dict-sv.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sw
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sw;
 	Name = "dict-sw.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Th
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Th;
 	Name = "dict-th.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Vi
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Vi;
 	Name = "dict-vi.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Zu
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Zu;
 	Name = "dict-zu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -2159,8 +2159,8 @@ End
 // #ifdef BUILD_SPECIAL
 // File gid_File_Extension_Oxt_Oooimprovement
 //    Name = "OOoImprovement.oxt";
-//    Dir = gid_Brand_Dir_Share_Extension_Install;
-//    Styles = (PACKED);
+//    Dir = gid_Brand_Dir_Share_Extensions_Oooimprovement;
+//    Styles = (PACKED, ARCHIVE);
 //    UnixRights = 444;
 // End
 // #endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index a4ab3bfab..19bdd6cc3 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -808,354 +808,4 @@ End
 // End
 // #endif
 
-Module gid_Module_Root_Extension_Dictionary_Af
-	Name = "gid_Module_Root_Extension_Dictionary_Af";
-	Description = "gid_Module_Root_Extension_Dictionary_Af";
-	Files = (gid_File_Extension_Dictionary_Af);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "af";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ca
-    Name = "gid_Module_Root_Extension_Dictionary_Ca";
-    Description = "gid_Module_Root_Extension_Dictionary_Ca";
-    Files = (gid_File_Extension_Dictionary_Ca);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "ca";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Cs
-	Name = "gid_Module_Root_Extension_Dictionary_Cs";
-	Description = "gid_Module_Root_Extension_Dictionary_Cs";
-	Files = (gid_File_Extension_Dictionary_Cs);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "cs";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Da
-	Name = "gid_Module_Root_Extension_Dictionary_Da";
-	Description = "gid_Module_Root_Extension_Dictionary_Da";
-	Files = (gid_File_Extension_Dictionary_Da);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "da";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_AT
-    Name = "gid_Module_Root_Extension_Dictionary_De_AT";
-    Description = "gid_Module_Root_Extension_Dictionary_De_AT";
-    Files = (gid_File_Extension_Dictionary_De_AT);
-	InstallOrder = "2000";
-    Spellcheckerlanguage = "de-AT";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_CH
-    Name = "gid_Module_Root_Extension_Dictionary_De_CH";
-    Description = "gid_Module_Root_Extension_Dictionary_De_CH";
-    Files = (gid_File_Extension_Dictionary_De_CH);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "de-CH";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_DE
-    Name = "gid_Module_Root_Extension_Dictionary_De_DE";
-    Description = "gid_Module_Root_Extension_Dictionary_De_DE";
-    Files = (gid_File_Extension_Dictionary_De_DE);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "de-DE";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_En
-	Name = "gid_Module_Root_Extension_Dictionary_En";
-	Description = "gid_Module_Root_Extension_Dictionary_En";
-	Files = (gid_File_Extension_Dictionary_En);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "en-US";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Es
-	Name = "gid_Module_Root_Extension_Dictionary_Es";
-	Description = "gid_Module_Root_Extension_Dictionary_Es";
-	Files = (gid_File_Extension_Dictionary_Es);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "es";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Et
-	Name = "gid_Module_Root_Extension_Dictionary_Et";
-	Description = "gid_Module_Root_Extension_Dictionary_Et";
-	Files = (gid_File_Extension_Dictionary_Et);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "et";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Fr
-	Name = "gid_Module_Root_Extension_Dictionary_Fr";
-	Description = "gid_Module_Root_Extension_Dictionary_Fr";
-	Files = (gid_File_Extension_Dictionary_Fr);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "fr";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Gl
-	Name = "gid_Module_Root_Extension_Dictionary_Gl";
-	Description = "gid_Module_Root_Extension_Dictionary_Gl";
-	Files = (gid_File_Extension_Dictionary_Gl);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "gl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_He
-    Name = "gid_Module_Root_Extension_Dictionary_He";
-    Description = "gid_Module_Root_Extension_Dictionary_He";
-    Files = (gid_File_Extension_Dictionary_He);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "he";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Hu
-	Name = "gid_Module_Root_Extension_Dictionary_Hu";
-	Description = "gid_Module_Root_Extension_Dictionary_Hu";
-	Files = (gid_File_Extension_Dictionary_Hu);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "hu";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_It
-	Name = "gid_Module_Root_Extension_Dictionary_It";
-	Description = "gid_Module_Root_Extension_Dictionary_It";
-	Files = (gid_File_Extension_Dictionary_It);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "it";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ku_Tr
-	Name = "gid_Module_Root_Extension_Dictionary_Ku_Tr";
-	Description = "gid_Module_Root_Extension_Dictionary_Ku_Tr";
-	Files = (gid_File_Extension_Dictionary_Ku_Tr);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "ku-TR";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Lt
-	Name = "gid_Module_Root_Extension_Dictionary_Lt";
-	Description = "gid_Module_Root_Extension_Dictionary_Lt";
-	Files = (gid_File_Extension_Dictionary_Lt);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "lt";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ne
-	Name = "gid_Module_Root_Extension_Dictionary_Ne";
-	Description = "gid_Module_Root_Extension_Dictionary_Ne";
-	Files = (gid_File_Extension_Dictionary_Ne);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "ne";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Nl
-	Name = "gid_Module_Root_Extension_Dictionary_Nl";
-	Description = "gid_Module_Root_Extension_Dictionary_Nl";
-	Files = (gid_File_Extension_Dictionary_Nl);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "nl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_No
-    Name = "gid_Module_Root_Extension_Dictionary_No";
-    Description = "gid_Module_Root_Extension_Dictionary_No";
-    Files = (gid_File_Extension_Dictionary_No);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "no";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Pl
-	Name = "gid_Module_Root_Extension_Dictionary_Pl";
-	Description = "gid_Module_Root_Extension_Dictionary_Pl";
-	Files = (gid_File_Extension_Dictionary_Pl);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "pl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Pt
-	Name = "gid_Module_Root_Extension_Dictionary_Pt";
-	Description = "gid_Module_Root_Extension_Dictionary_Pt";
-	Files = (gid_File_Extension_Dictionary_Pt);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "pt";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ro
-    Name = "gid_Module_Root_Extension_Dictionary_Ro";
-    Description = "gid_Module_Root_Extension_Dictionary_Ro";
-    Files = (gid_File_Extension_Dictionary_Ro);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "ro";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ru
-	Name = "gid_Module_Root_Extension_Dictionary_Ru";
-	Description = "gid_Module_Root_Extension_Dictionary_Ru";
-	Files = (gid_File_Extension_Dictionary_Ru);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "ru";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
 
-Module gid_Module_Root_Extension_Dictionary_Sk
-	Name = "gid_Module_Root_Extension_Dictionory_Sk";
-	Description = "gid_Module_Root_Extension_Dictionary_Sk";
-	Files = (gid_File_Extension_Dictionary_Sk);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "sk";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sl
-	Name = "gid_Module_Root_Extension_Dictionary_Sl";
-	Description = "gid_Module_Root_Extension_Dictionary_Sl";
-	Files = (gid_File_Extension_Dictionary_Sl);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "sl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sr
-	Name = "gid_Module_Root_Extension_Dictionary_Sr";
-	Description = "gid_Module_Root_Extension_Dictionary_Sr";
-	Files = (gid_File_Extension_Dictionary_Sr);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "sr";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sv
-	Name = "gid_Module_Root_Extension_Dictionary_Sv";
-	Description = "gid_Module_Root_Extension_Dictionary_Sv";
-	Files = (gid_File_Extension_Dictionary_Sv);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "sv";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sw
-	Name = "gid_Module_Root_Extension_Dictionary_Sw";
-	Description = "gid_Module_Root_Extension_Dictionary_Sw";
-	Files = (gid_File_Extension_Dictionary_Sw);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "sw";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Th
-	Name = "gid_Module_Root_Extension_Dictionary_Th";
-	Description = "gid_Module_Root_Extension_Dictionary_Th";
-	Files = (gid_File_Extension_Dictionary_Th);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "th";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Vi
-	Name = "gid_Module_Root_Extension_Dictionary_Vi";
-	Description = "gid_Module_Root_Extension_Dictionary_Vi";
-	Files = (gid_File_Extension_Dictionary_Vi);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "vi";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Zu
-	Name = "gid_Module_Root_Extension_Dictionary_Zu";
-	Description = "gid_Module_Root_Extension_Dictionary_Zu";
-	Files = (gid_File_Extension_Dictionary_Zu);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "zu";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index d77c05768..5b1de3897 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -49,3 +49,362 @@ Module gid_Module_Optional
     Sortkey = "200";
     MOD_NAME_DESC ( MODULE_OPTIONAL );
 End
+
+Module gid_Module_Dictionaries
+    ParentID = gid_Module_Root;
+    XPDParentID = "root";
+    Sortkey = "300";
+    MOD_NAME_DESC ( MODULE_DICTIONARIES );
+End
+
+Module gid_Module_Root_Extension_Dictionary_Af
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF );
+	Files = (gid_File_Extension_Dictionary_Af);
+	InstallOrder = "2000";
+    Sortkey = "510";
+	Spellcheckerlanguage = "af";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ca
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CA );
+    Files = (gid_File_Extension_Dictionary_Ca);
+    InstallOrder = "2000";
+    Sortkey = "520";
+    Spellcheckerlanguage = "ca";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Cs
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CS );
+	Files = (gid_File_Extension_Dictionary_Cs);
+	InstallOrder = "2000";
+    Sortkey = "530";
+	Spellcheckerlanguage = "cs";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Da
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DA );
+	Files = (gid_File_Extension_Dictionary_Da);
+    Sortkey = "540";
+	InstallOrder = "2000";
+	Spellcheckerlanguage = "da";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_De_AT
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_AT );
+    Files = (gid_File_Extension_Dictionary_De_AT);
+	InstallOrder = "2000";
+    Sortkey = "570";
+    Spellcheckerlanguage = "de-AT";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_De_CH
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_CH );
+    Files = (gid_File_Extension_Dictionary_De_CH);
+    InstallOrder = "2000";
+    Sortkey = "580";
+    Spellcheckerlanguage = "de-CH";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_De_DE
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_DE );
+    Files = (gid_File_Extension_Dictionary_De_DE);
+    InstallOrder = "2000";
+    Sortkey = "575";
+    Spellcheckerlanguage = "de-DE";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_En
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN );
+	Files = (gid_File_Extension_Dictionary_En);
+	InstallOrder = "2000";
+    Sortkey = "550";
+	Spellcheckerlanguage = "en-US";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Es
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ES );
+	Files = (gid_File_Extension_Dictionary_Es);
+	InstallOrder = "2000";
+    Sortkey = "720";
+	Spellcheckerlanguage = "es";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Et
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ET );
+	Files = (gid_File_Extension_Dictionary_Et);
+	InstallOrder = "2000";
+    Sortkey = "555";
+	Spellcheckerlanguage = "et";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Fr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FR );
+	Files = (gid_File_Extension_Dictionary_Fr);
+	InstallOrder = "2000";
+    Sortkey = "560";
+	Spellcheckerlanguage = "fr";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Gl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GL );
+	Files = (gid_File_Extension_Dictionary_Gl);
+	InstallOrder = "2000";
+    Sortkey = "565";
+	Spellcheckerlanguage = "gl";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_He
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HE );
+    Files = (gid_File_Extension_Dictionary_He);
+    InstallOrder = "2000";
+    Sortkey = "590";
+    Spellcheckerlanguage = "he";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Hu
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HU );
+	Files = (gid_File_Extension_Dictionary_Hu);
+	InstallOrder = "2000";
+    Sortkey = "600";
+	Spellcheckerlanguage = "hu";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_It
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IT );
+	Files = (gid_File_Extension_Dictionary_It);
+	InstallOrder = "2000";
+    Sortkey = "610";
+	Spellcheckerlanguage = "it";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ku_Tr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_KU_TR );
+	Files = (gid_File_Extension_Dictionary_Ku_Tr);
+	InstallOrder = "2000";
+    Sortkey = "620";
+	Spellcheckerlanguage = "ku-TR";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Lt
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LT );
+	Files = (gid_File_Extension_Dictionary_Lt);
+	InstallOrder = "2000";
+    Sortkey = "630";
+	Spellcheckerlanguage = "lt";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ne
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NE );
+	Files = (gid_File_Extension_Dictionary_Ne);
+	InstallOrder = "2000";
+    Sortkey = "640";
+	Spellcheckerlanguage = "ne";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Nl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NL );
+	Files = (gid_File_Extension_Dictionary_Nl);
+	InstallOrder = "2000";
+    Sortkey = "545";
+	Spellcheckerlanguage = "nl";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_No
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NO );
+    Files = (gid_File_Extension_Dictionary_No);
+    InstallOrder = "2000";
+    Sortkey = "650";
+    Spellcheckerlanguage = "no";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Pl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PL );
+	Files = (gid_File_Extension_Dictionary_Pl);
+	InstallOrder = "2000";
+    Sortkey = "660";
+	Spellcheckerlanguage = "pl";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Pt
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PT );
+	Files = (gid_File_Extension_Dictionary_Pt);
+	InstallOrder = "2000";
+    Sortkey = "515";
+	Spellcheckerlanguage = "pt";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ro
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_RO );
+    Files = (gid_File_Extension_Dictionary_Ro);
+    InstallOrder = "2000";
+    Sortkey = "670";
+    Spellcheckerlanguage = "ro";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ru
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_RU );
+	Files = (gid_File_Extension_Dictionary_Ru);
+	InstallOrder = "2000";
+    Sortkey = "680";
+	Spellcheckerlanguage = "ru";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sk
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SK );
+	Files = (gid_File_Extension_Dictionary_Sk);
+	InstallOrder = "2000";
+    Sortkey = "700";
+	Spellcheckerlanguage = "sk";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SL );
+	Files = (gid_File_Extension_Dictionary_Sl);
+	InstallOrder = "2000";
+    Sortkey = "710";
+	Spellcheckerlanguage = "sl";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SR );
+	Files = (gid_File_Extension_Dictionary_Sr);
+	InstallOrder = "2000";
+    Sortkey = "690";
+	Spellcheckerlanguage = "sr";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sv
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SV );
+	Files = (gid_File_Extension_Dictionary_Sv);
+	InstallOrder = "2000";
+    Sortkey = "740";
+	Spellcheckerlanguage = "sv";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sw
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SW );
+	Files = (gid_File_Extension_Dictionary_Sw);
+	InstallOrder = "2000";
+    Sortkey = "730";
+	Spellcheckerlanguage = "sw";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Th
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TH );
+	Files = (gid_File_Extension_Dictionary_Th);
+	InstallOrder = "2000";
+    Sortkey = "750";
+	Spellcheckerlanguage = "th";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Vi
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_VI );
+	Files = (gid_File_Extension_Dictionary_Vi);
+	InstallOrder = "2000";
+    Sortkey = "760";
+	Spellcheckerlanguage = "vi";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Zu
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ZU );
+	Files = (gid_File_Extension_Dictionary_Zu);
+	InstallOrder = "2000";
+    Sortkey = "770";
+	Spellcheckerlanguage = "zu";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 4660a2a44..ee818ae4a 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -43,5 +43,200 @@ en-US = "Optional Components"
 [STR_DESC_MODULE_OPTIONAL]
 en-US = "Common components and additional programs shared by all %PRODUCTNAME programs."
 
+[STR_NAME_MODULE_DICTIONARIES]
+en-US = "Dictionaries"
 
+[STR_DESC_MODULE_DICTIONARIES]
+en-US = "Spelling and hyphenation dictionaries and thesauri."
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
+en-US = "Afrikaans spell checker"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_CA]
+en-US = "Spelling and hyphenation dictionaries and thesaurus for Catalan language (general)"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_CS]
+en-US = "Czech thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DA]
+en-US = "Spelling and hyphenation dictionary for Danish"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_AT]
+en-US = "German (Austria)"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_AT]
+en-US = "German (AT-frami) spelling, hyphenation, thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_CH]
+en-US = "German (Switzerland)"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_CH]
+en-US = "German (CH-frami) spelling, hyphenation, thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_DE]
+en-US = "German (Germany)"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_DE]
+en-US = "German (DE-frami) spelling, hyphenation, thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_EN]
+en-US = "English"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_EN]
+en-US = "English spelling and hyphenation dictionaries and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ES]
+en-US = "Spanish spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ET]
+en-US = "Estonian spelling and hyphenation dictionaries"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_FR]
+en-US = "French 'Classic and Reform 1990' spelling, thesaurus and hyphenation"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_GL]
+en-US = "Galician spellchecker dictionary for OpenOffice.org"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HE]
+en-US = "Hebrew spell check dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HU]
+en-US = "Hungarian spelling dictionary, hyphenation patterns, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_IT]
+en-US = "Italian spelling and hyphenation dictionaries and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_KU_TR]
+en-US = "Kurdish (Turkey)"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_KU_TR]
+en-US = "Kurdish (Turkey) spell check dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_LT]
+en-US = "Lithuanian spelling and hyphenation dictionaries"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_NE]
+en-US = "Nepali spelling dictionary and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_NL]
+en-US = "Dutch spelling and hyphenation dictionaries"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_NO]
+en-US = "Norwegian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_NO]
+en-US = "Norwegian dictionaries (Nynorsk and Bokmal)"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_PL]
+en-US = "Polish spell check dictionary, hyphenation rules and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_PT]
+en-US = "Brazilian Portuguese"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_PT]
+en-US = "Brazilian Portuguese Spelling Dictionary - 1990 Spelling Agreement"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_RO]
+en-US = "Romanian Dictionaries"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_RU]
+en-US = "Russian hyphenation dictionary and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SK]
+en-US = "Slovak spell check dictionary, hyphenation rules and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SL]
+en-US = "Slovenian dictionary pack"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SR]
+en-US = "Serbian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SR]
+en-US = "Serbian spelling and hyphenation dictionaries"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SV]
+en-US = "Swedish Dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SW]
+en-US = "Swahili spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
+en-US = "Thai spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_VI]
+en-US = "Vietnamese spellchecker dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ZU]
+en-US = "Zulu hyphenation dictionary"
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index ebd0b87fb..9818d5b26 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -173,6 +173,24 @@ End
 
 #endif
 
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "BUNDLED_EXTENSIONS";
+    Value = "$BRAND_BASE_DIR/share/extensions";
+End
+
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "BUNDLED_EXTENSIONS_USER";
+    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
+End
+
 ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;
@@ -191,6 +209,15 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages_Cache
     Value = "$UNO_SHARED_PACKAGES/cache";
 End
 
+ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "SHARED_EXTENSIONS_USER";
+    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
+End
+
 ProfileItem gid_Profileitem_Uno_Uno_User_Packages
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;
@@ -200,6 +227,15 @@ ProfileItem gid_Profileitem_Uno_Uno_User_Packages
     Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
 End
 
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "TMP_EXTENSIONS";
+    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
+End
+
 ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;
@@ -208,6 +244,14 @@ ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
     Key = "UNO_USER_PACKAGES_CACHE";
     Value = "$UNO_USER_PACKAGES/cache";
 End
+ProfileItem gid_Profileitem_Uno_Pkg_BundledUnoFile
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 5;
+    Key = "PKG_BundledUnoFile";
+    Value = "$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
+End
 
 ProfileItem gid_Profileitem_Uno_Pkg_SharedUnoFile
     ProfileID = gid_Profile_Uno_Ini;
@@ -215,7 +259,7 @@ ProfileItem gid_Profileitem_Uno_Pkg_SharedUnoFile
     Section = "Bootstrap";
     Order = 5;
     Key = "PKG_SharedUnoFile";
-    Value = "$UNO_SHARED_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
+    Value = "$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
 End
 
 ProfileItem gid_Profileitem_Uno_Pkg_UserUnoFile
@@ -227,6 +271,22 @@ ProfileItem gid_Profileitem_Uno_Pkg_UserUnoFile
     Value = "$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
 End
 
+ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions
+    ModuleID = gid_Module_Root;
+    ProfileID = gid_Profile_Fundamentalbasis_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS}";
+End
+
+ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions_User
+    ModuleID = gid_Module_Root;
+    ProfileID = gid_Profile_Fundamentalbasis_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS_USER";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}";
+End
+
 ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Packages_Cache
     ModuleID = gid_Module_Root;
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
@@ -235,6 +295,14 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Packages_Cache
     Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_SHARED_PACKAGES_CACHE}";
 End
 
+ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Extensions_User
+    ModuleID = gid_Module_Root;
+    ProfileID = gid_Profile_Fundamentalbasis_Ini;
+    Section = "Bootstrap";
+    Key = "SHARED_EXTENSIONS_USER";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}";
+End
+
 ProfileItem gid_Profileitem_Fundamentalbasis_Uno_User_Packages_Cache
     ModuleID = gid_Module_Root;
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
@@ -243,15 +311,23 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Uno_User_Packages_Cache
     Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}";
 End
 
+ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Tmp_Extensions
+    ModuleID = gid_Module_Root;
+    ProfileID = gid_Profile_Fundamentalbasis_Ini;
+    Section = "Bootstrap";
+    Key = "TMP_EXTENSIONS";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
+End
+
 ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types
     ModuleID = gid_Module_Root;
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
     Section = "Bootstrap";
     Key = "URE_MORE_TYPES";
 #if defined ENABLE_VBA && !defined VBA_EXTENSION
-    Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES}";
+    Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
 #else
-    Value = "$ORIGIN/offapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES}";
+    Value = "$ORIGIN/offapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
 #endif
 End
 
@@ -260,7 +336,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
     Section = "Bootstrap";
     Key = "URE_MORE_SERVICES";
-    Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb";
+    Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb";
 End
 
 ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types
@@ -268,7 +344,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
     Section = "Bootstrap";
     Key = "URE_MORE_JAVA_TYPES";
-    Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}";
+    Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
 End
 
 ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_Shared_Data
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 22aba304c..9aeaf32c5 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -896,7 +896,7 @@ End
 File gid_File_Dl_GccS
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_VER("gcc_s", "1");
+    Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
 End
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 9228b5cd7..568b3996a 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -199,16 +199,6 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll7
 	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate");
 End
 
-WindowsCustomAction gid_Customaction_Register_Extensions
-	Name = "RegisterExtensions";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "RegisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
-	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
-End
-
 WindowsCustomAction gid_Customaction_Set_Admininstall
 	Name = "SetAdminInstallProperty";
 	Typ = "65";
@@ -218,27 +208,6 @@ WindowsCustomAction gid_Customaction_Set_Admininstall
 	Assignment1 = ("AdminExecuteSequence", "", "InstallInitialize");
 End
 
-/*
-WindowsCustomAction gid_Customaction_Remove_Extensions
-	Name = "RemoveExtensions";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "RemoveExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "Shellextensionsdll4");
-End
-*/
-
-WindowsCustomAction gid_Customaction_Deregister_Extensions
-	Name = "DeregisterExtensions";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "DeregisterExtensions";
-	Inbinarytable = 1;
-	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"\"", "gid_Customaction_Remove_Extensions");
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"\"", "behind_IsolateComponents");
-End
-
 WindowsCustomAction gid_Customaction_Check_Install_Directory
 	Name = "CheckInstallDirectory";
 	Typ = "65";
@@ -318,44 +287,6 @@ WindowsCustomAction gid_Customaction_Patch_InstallExchangeFiles
 	Assignment2 = ("AdminExecuteSequence", "", "behind_InstallFinalize");
 End
 
-WindowsCustomAction gid_Customaction_Langpack_Register_Extensions
-	Name = "RegisterExtensions";
-	Typ = "65";
-	Source = "lngpckinsthlp.dll";
-	Target = "RegisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "end");
-	Assignment2 = ("AdminExecuteSequence", "", "end");
-End
-
-WindowsCustomAction gid_Customaction_Langpack_Deregister_Extensions
-	Name = "DeregisterExtensions";
-	Typ = "65";
-	Source = "lngpckinsthlp.dll";
-	Target = "DeregisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "InstallInitialize");
-End
-
-WindowsCustomAction gid_Customaction_Patch_Register_Extensions
-	Name = "RegisterExtensions";
-	Typ = "65";
-	Source = "patchmsi.dll";
-	Target = "RegisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "end");
-	Assignment2 = ("AdminExecuteSequence", "", "end");
-End
-
-WindowsCustomAction gid_Customaction_Patch_Deregister_Extensions
-	Name = "DeregisterExtensions";
-	Typ = "65";
-	Source = "patchmsi.dll";
-	Target = "DeregisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "InstallInitialize");
-End
-
 WindowsCustomAction gid_Customaction_Patch_SetFeatureState
 	Name = "SetFeatureState";
 	Typ = "65";
diff --git a/set_soenv.in b/set_soenv.in
index 7983933c6..e827c3cb3 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1662,6 +1662,7 @@ ToFile( "MOC4",              "@MOC4@",             "e" );
 ToFile( "ENABLE_KAB",        "@ENABLE_KAB@",       "e" );
 ToFile( "PSPRINT",           "TRUE",             "e" );
 ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
+ToFile( "nodep",             "@nodep@",          "e" );
 ToFile( "TARFILE_LOCATION",  $TARFILE_LOCATION,  "e" );
 ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@",  "e" );
 #
@@ -1896,6 +1897,7 @@ ToFile( "SYSTEM_CURL",       "@SYSTEM_CURL@",      "e" );
 ToFile( "CURL_CFLAGS",       "@CURL_CFLAGS@",      "e" );
 ToFile( "CURL_LIBS",         "@CURL_LIBS@",        "e" );
 ToFile( "SYSTEM_BOOST",      "@SYSTEM_BOOST@",     "e" );
+ToFile( "SYSTEM_MDDS",       "@SYSTEM_MDDS@",      "e" );
 ToFile( "SYSTEM_VIGRA",      "@SYSTEM_VIGRA@",     "e" );
 ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
 ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
@@ -1916,9 +1918,14 @@ ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
 ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
 ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
 ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",   "e" );
+ToFile( "HAVE_GETOPT",       "@HAVE_GETOPT@",      "e" );
+ToFile( "HAVE_READDIR_R",    "@HAVE_READDIR_R@",   "e" );
+ToFile( "SYSTEM_LIBC",       "@SYSTEM_LIBC@",      "e" );
 ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
 ToFile( "HYPHEN_LIB",        "@HYPHEN_LIB@",       "e" );
 ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
+ToFile( "MYTHES_CFLAGS",     "@MYTHES_CFLAGS@",    "e" );
+ToFile( "MYTHES_LIBS",       "@MYTHES_LIBS@",      "e" );
 ToFile( "PAM",               "@PAM@",              "e" );
 ToFile( "NEW_SHADOW_API",    "@NEW_SHADOW_API@",   "e" );
 ToFile( "PAM_LINK",          "@PAM_LINK@",         "e" );
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index f776f8cf3..f241ea039 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -56,10 +56,7 @@ use Cws;
 
 #### globals ####
 
-# TODO: replace dummy vales with actual SVN->hg and source_config migration milestones
-my $dev300_migration_milestone = 'm64';
-my $dev300_source_config_milestone = 'm65';
-my $ooo320_migration_milestone = 'm13';
+# TODO: replace dummy vales with actual source_config migration milestone
 my $ooo320_source_config_milestone = 'm999';
 
 # valid command with possible abbreviations
@@ -67,11 +64,8 @@ my @valid_commands = (
                         'help', 'h', '?',
                         'create', 
                         'fetch',  'f', 
-                        'rebase', 'rb',
                         'query', 'q',
                         'task', 't',
-                        'integrate',
-                        'cdiff', 'cd',
                         'eisclone',
                         'setcurrent'
                      );
@@ -80,13 +74,10 @@ my @valid_commands = (
 my %valid_options_hash = ( 
                             'help'       => ['help'],
                             'create'     => ['help', 'milestone', 'migration', 'hg'],
-                            'fetch'      => ['help', 'switch', 'milestone', 'childworkspace','platforms','quiet',
+                            'fetch'      => ['help', 'milestone', 'childworkspace','platforms','quiet',
                                             'onlysolver'],
-                            'rebase'     => ['help', 'milestone','commit'],
                             'query'      => ['help', 'milestone','masterworkspace','childworkspace'],
                             'task'       => ['help'],
-                            'integrate'  => ['help', 'childworkspace'],
-                            'cdiff'      => ['help', 'childworkspace', 'masterworkspace', 'files', 'modules'],
                             'setcurrent' => ['help', 'milestone'],
                             'eisclone'   => ['help']
                          );
@@ -128,12 +119,9 @@ sub parse_command_line
                                              'debug',
                                              'profile',
                                              'commit|C',
-                                             'switch|s',
                                              'platforms|p=s',
                                              'onlysolver|o',
                                              'quiet|q',
-                                             'files',
-                                             'modules',
                                              'help|h'
                             );
 
@@ -151,18 +139,12 @@ sub parse_command_line
     elsif ($command eq 'f') {
         $command = 'fetch';
     }
-    elsif ($command eq 'rb') {
-        $command = 'rebase';
-    }
     elsif ($command eq 'q') {
         $command = 'query';
     }
     elsif ($command eq 't') {
         $command = 'task';
     }
-    elsif ($command eq 'cd') {
-        $command = 'cdiff';
-    }
 
     # An unkown option might be accompanied with a valid command.
     # Show the command specific help
@@ -202,8 +184,6 @@ sub verify_options
         }
     }
 
-    # TODO here should be specific checks for the arguments
-    # if the check is globally valid
 }
 
 # Dispatches to the do_xxx() routines depending on command.
@@ -259,66 +239,6 @@ BEGIN {
     }
 }
 
-# Fetches milestone URL for given server and milestone.
-sub get_milestone_url
-{
-    my $server    = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    my $milestone_url = "$server/tags/${master}_${milestone}";
-    return $milestone_url;
-}
-
-# Fetches CWS URL for given server and CWSname.
-sub get_cws_url
-{
-    my $server = shift;
-    my $cws    = shift;
-
-    my $cws_url = "$server/cws/$cws";
-    return $cws_url;
-}
-
-sub get_master_url
-{
-    my $server   = shift;
-    my $master   = shift;
-    my $revision = shift;
-
-    my $url = "${server}/";
-
-    # TODO: update EIS function for subversion
-    my $cws = get_this_cws();
-    my $trunk = $cws->get_cvs_head();
-    if ( $master eq $trunk ) {
-        $url .= 'trunk';
-    }
-    else {
-        my $master_label = uc($master);
-        $url .= "branches/$master_label";
-    }
-
-    # attach revision if needed
-    if ( $revision != 0 ) {
-        $url .= "\@$revision";
-    }
-    return $url;
-}
-
-# Returns the URL shortened by the server part
-sub get_short_url
-{
-    my $server = shift;
-    my $url    = shift;
-
-    my $offset = length("$server/");
-    $url = substr($url, $offset);
-
-    return $url;
-}
-
-
 # Fetches the current CWS from environment, returns a Cws object
 sub get_cws_from_environment
 {
@@ -849,11 +769,11 @@ sub query_latest
 
     if ( $latest ) {
         print_message("Master workspace '$masterws':");
-        print_message("Latest milestone available for rebase:");
+        print_message("Latest milestone available for update:");
         print "$masterws $latest\n";
     }
     else {
-        print_error("Can't determine latest milestone of '$masterws' available for rebase.", 3);
+        print_error("Can't determine latest milestone of '$masterws' available for update.", 3);
     }
 
     return;
@@ -1420,106 +1340,6 @@ sub update_solver
      }
 }
 
-sub write_rebase_configuration
-{
-    my $workspace = shift;
-    my $cwsname   = shift;
-    my $master    = shift;
-    my $milestone = shift;
-
-    my $rebase_config = "$workspace/REBASE.CONFIG_DONT_DELETE";
-
-    open(REBASE, ">$rebase_config") or print_error("Can't open file '$rebase_config' for writing: $!", 98);
-    print REBASE "CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'\n";
-    print REBASE "CWS: $cwsname\n";
-    print REBASE "New MWS: $master\n";
-    print REBASE "New milestone: $milestone\n";
-    close(REBASE);
-}
-
-sub read_rebase_configuration
-{
-    my $workspace = shift;
-
-    my $rebase_config = "$workspace/REBASE.CONFIG_DONT_DELETE";
-
-    my $master;
-    my $milestone;
-
-    open(REBASE, "<$rebase_config") or print_error("Can't open file '$rebase_config' for reading: $!", 98);
-    while(<REBASE>) {
-        if ( /New MWS: (\w+)/ ) {
-            $master = $1;
-        }
-        if ( /New milestone: (\w+)/ ) {
-            $milestone = $1;
-        }
-    }
-    close(REBASE);
-
-    if ( !defined($master) || !defined($milestone) ) {
-        print_error("File '$rebase_config' seems to be garbled. Can't continue.", 98)
-    }
-
-    return ($master, $milestone);
-}
-
-sub diff_print_files
-{
-    my $files_ref = shift;
-    my $diff_options = shift;
-
-    my @files = sort(@{$files_ref});
-
-    if ( $diff_options eq 'files') {
-        foreach(@files) {
-            print "$_\n";
-        }
-    }
-    else {
-        my @modules;
-        foreach(@files) {
-            my ($module) = split(/\//, $_);
-            push(@modules, $module);
-        }
-        # remove adjacent uniques
-        my $prev = 'nosuchmodule';
-        my @unique_modules = grep($_ ne $prev && (($prev) = $_), @modules);
-        foreach(@unique_modules) {
-            print "$_\n";
-        }
-    }
-}
-
-# TODO: special provisions for SVN->HG migrations, remove this 
-# some time after migration
-sub get_scm_for_milestone
-{
-    my $masterws = shift;
-    my $milestone = shift;
-
-    my $milestone_sequence_number = extract_milestone_sequence_number($milestone);
-    my $dev300_migration_sequence_number = extract_milestone_sequence_number($dev300_migration_milestone);
-    my $ooo320_migration_sequence_number = extract_milestone_sequence_number($ooo320_migration_milestone);
-
-    my $scm = 'SVN';
-
-    if ( $masterws eq 'DEV300' ) {
-        if ( $milestone_sequence_number >= $dev300_migration_sequence_number ) {
-            $scm = 'HG'; 
-        }
-    }
-    elsif ( $masterws eq 'OOO320' ) {
-        if ( $milestone_sequence_number >= $ooo320_migration_sequence_number ) {
-            $scm = 'HG'; 
-        }
-    }
-    else {
-        $scm = 'SVN';
-    }
-    return $scm;
-}
-
 # TODO: special provisions for "source_config" migration, remove this 
 # some time after migration
 sub get_source_config_for_milestone
@@ -1528,24 +1348,14 @@ sub get_source_config_for_milestone
     my $milestone = shift;
 
     my $milestone_sequence_number = extract_milestone_sequence_number($milestone);
-    my $dev300_migration_sequence_number = extract_milestone_sequence_number($dev300_source_config_milestone);
     my $ooo320_migration_sequence_number = extract_milestone_sequence_number($ooo320_source_config_milestone);
 
-    my $source_config = 0;
-
-    if ( $masterws eq 'DEV300' ) {
-        if ( $milestone_sequence_number >= $dev300_migration_sequence_number ) {
-            $source_config = 1; 
-        }
-    }
-    elsif ( $masterws eq 'OOO320' ) {
-        if ( $milestone_sequence_number >= $ooo320_migration_sequence_number ) {
-            $source_config = '1'; 
+    my $source_config = 1;
+    if ( $masterws eq 'OOO320' ) {
+        if ( $milestone_sequence_number < $ooo320_migration_sequence_number ) {
+            $source_config = 0; 
         }
     }
-    else {
-        $source_config = 0;
-    }
     return $source_config;
 }
 
@@ -1577,12 +1387,9 @@ sub do_help
         print STDERR "\thelp (h,?)\n";
         print STDERR "\tcreate\n";
         print STDERR "\tfetch (f)\n";
-        print STDERR "\trebase (rb) (SVN only)\n";
         print STDERR "\tquery (q)\n";
         print STDERR "\ttask (t)\n";
-        print STDERR "\tcdiff (cd) (SVN only)\n";
         print STDERR "\tsetcurrent\n";
-        print STDERR "\tintegrate *** release engineers only ***\n";
         print STDERR "\teisclone *** release engineers only ***\n";
     }
 
@@ -1594,13 +1401,10 @@ sub do_help
     }
     elsif ($arg eq 'create') {
         print STDERR "create: Create a new child workspace\n";
-        print STDERR "usage: create [--hg] [-m milestone] <master workspace> <child workspace>\n";
+        print STDERR "usage: create [-m milestone] <master workspace> <child workspace>\n";
         print STDERR "\t-m milestone:          Milestone to base the child workspace on. If ommitted the\n";
         print STDERR "\t                       last published milestone will be used.\n";
         print STDERR "\t--milestone milestone: Same as -m milestone.\n";
-        print STDERR "\t--hg:                  Create Mercurial (hg) based CWS.\n";
-        print STDERR "\t--migration:           Used only for the migration of an exitisting CWS from CVS to SVN.\n";
-        print STDERR "\t                       Disables existence check in EIS, creates CWS branch in SVN, sets SVN flag.\n";
     }
     elsif ($arg eq 'task') {
         print STDERR "task: Add a task to a child workspace\n";
@@ -1651,18 +1455,16 @@ sub do_help
      }
     elsif ($arg eq 'fetch') {
         print STDERR "fetch: fetch a milestone or CWS\n";
-        print STDERR "usage: fetch [-q] [-s] [-p platforms] [-o] <-m milestone> <workspace>\n";
-        print STDERR "usage: fetch [-q] [-s] [-p platforms] [-o] <-c cws> <workspace>\n";
-        print STDERR "usage: fetch [-q] [-s] <-m milestone> <workspace>\n";
-        print STDERR "usage: fetch [-q] [-s] <-c cws> <workspace>\n";
+        print STDERR "usage: fetch [-q] [-p platforms] [-o] <-m milestone> <workspace>\n";
+        print STDERR "usage: fetch [-q] [-p platforms] [-o] <-c cws> <workspace>\n";
+        print STDERR "usage: fetch [-q] <-m milestone> <workspace>\n";
+        print STDERR "usage: fetch [-q] <-c cws> <workspace>\n";
         print STDERR "\t-m milestone:           Checkout milestone <milestone> to workspace <workspace>\n";
         print STDERR "\t                        Use 'latest' for the for lastest published milestone on the current master\n";
         print STDERR "\t                        For cross master checkouts use the form <MWS>:<milestone>\n";
         print STDERR "\t--milestone milestone:  Same as -m milestone\n";
         print STDERR "\t-c childworkspace:      Checkout CWS <childworkspace> to workspace <workspace>\n";
         print STDERR "\t--child childworkspace: Same as -c childworkspace\n";
-        print STDERR "\t-s:                     Try to switch an existing workspace <workspace> to milestone or CWS\n";
-        print STDERR "\t--switch:               Same as -s\n";
         print STDERR "\t-p platform:            Copy one or more prebuilt platforms 'platform'. \n";
         print STDERR "\t                        Separate multiple platforms with commas.\n";
         print STDERR "\t--platforms platform:   Same as -p\n";
@@ -1671,36 +1473,6 @@ sub do_help
         print STDERR "\t-q                      Silence some of the output of the command.\n";
         print STDERR "\t--quiet:                Same as -q\n";
     }
-    elsif ($arg eq 'rebase') {
-        print STDERR "rebase: Rebase a child workspace to a new milestone (SVN only)\n";
-        print STDERR "usage: rebase <-m milestone> <workspace>\n";
-        print STDERR "usage: rebase <-C> <workspace>\n";
-        print STDERR "\t-m milestone:          Merge changes on MWS into CWS up to and including milestone <milestone>\n";
-        print STDERR "\t                       Use 'latest' for the for lastest published milestone on the current master\n";
-        print STDERR "\t                       For cross master rebases use the form <MWS>:<milestone>\n";
-        print STDERR "\t--milestone milestone: Same as -m milestone\n";
-        print STDERR "\t-C:                    Commit changes made by merge step and update current milestone in database\n";
-        print STDERR "\t--commit:              Same as -C\n"
-    }
-    elsif ($arg eq 'integrate') {
-        print STDERR "integrate: Integrate a child workspace into a master workspace\n";
-        print STDERR "usage: integrate <-c childworkspace>\n";
-        print STDERR "usage: integrate <-C>\n";
-        print STDERR "\t-c childworkspace:      Merge changes on CWS <childworkspace> into MWS\n";
-        print STDERR "\t--child childworkspace: Same as -c childworkspace\n";
-        print STDERR "\t-C:                     Commit changes made by merge step and update CWS status in database\n";
-        print STDERR "\t--commit:               Same as -C\n"
-    }
-    elsif ($arg eq 'cdiff') {
-        print STDERR "cdiff: Show changes on CWS relative to current milestone (SVN only)\n";
-        print STDERR "usage: cdiff [-M master] [-c child] [--files] [--modules]\n";
-        print STDERR "\t-M master:\t\toverride MWS specified in environment\n";
-        print STDERR "\t-c child:\t\toverride CWS specified in environment\n";
-        print STDERR "\t--master master:\tSame as -M master\t\n";
-        print STDERR "\t--child child:\t\tSame -c child\n";
-        print STDERR "\t--files:                Print only file names\n";
-        print STDERR "\t--modules:              Print only top level directories aka modules\n"
-    }
     elsif ($arg eq 'setcurrent') {
         print STDERR "setcurrent: Set the current milestone for the CWS (only hg based CWSs)\n";
         print STDERR "usage: setcurrent [-m milestone]\n";
@@ -1726,14 +1498,8 @@ sub do_create
         do_help(['create']);
     }
 
-    my $is_migration = 0;
-    if ( exists $options_ref->{'migration'} ) {
-        $is_migration = 1;
-    }
-
-    my $is_hg = 0;
     if ( exists $options_ref->{'hg'} ) {
-        $is_hg = 1;
+        print_warning("All childworkspaces are now hosted on Mercurial. The switch --hg is obsolete.");
     }
 
     my $master   = uc $args_ref->[0];
@@ -1765,12 +1531,7 @@ sub do_create
             $is_promotion++;
         }
         else {
-            if ( $is_migration ) {
-                print_message("Create CWS branch in Subversion for migrating CWS '$cws_name' from CVS.");
-            }
-            else {
-                print_error("Child workspace '$cws_name' already exists.", 7);
-            }
+            print_error("Child workspace '$cws_name' already exists.", 7);
         }
     }
     else {
@@ -1796,332 +1557,11 @@ sub do_create
     # set milestone
     $cws->milestone($milestone);
 
-    # handle mercurial(hg) based CWSs
-    if ( $is_hg ) {
-        register_child_workspace($cws, 'hg', $is_promotion);
-        return;
-    }
-
-    # Refuse to create Subversion hosted cildworkspaces after 
-    # migration milestone
-    my $milestone_scm = get_scm_for_milestone($cws->master(), $cws->milestone());
-    if ( $milestone_scm eq 'HG' ) {
-        print_error("This code line has been migrated to Mercurial.", 0);
-        print_error("Please use the '--hg' option to create a Mercurial hosted CWS.", 8);
-    }
-
-    my $config = CwsConfig->new();
-    my $ooo_svn_server = $config->get_ooo_svn_server();
-    my $so_svn_server = $config->get_so_svn_server();
-
-    if (!defined($ooo_svn_server)) {
-        print_error("No OpenOffice.org SVN server defined, please check your configuration file.", 8);
-    }
-
-    my $ooo_milestone_url = get_milestone_url($ooo_svn_server, $cws->master(), $milestone);
-    my $ooo_cws_url = get_cws_url($ooo_svn_server, $cws_name);
-
-    my $so_milestone_url;
-    my $so_cws_url;
-    if ( defined($so_svn_server) ) { 
-        $so_milestone_url = get_milestone_url($so_svn_server, $cws->master(), $milestone);
-        $so_cws_url = get_cws_url($so_svn_server, $cws_name);
-    }
-
-    # There is a slight chance that the cws creation was interrupted before registration before. 
-    # Check for potential remains in the repository
-    my $ooo_path_exists = 0;
-    my $so_path_exists = 0;
-
-    print STDERR "... check cws path:\t'$ooo_cws_url'";
-    if ( svn_path_exists($ooo_cws_url) ) {
-        $ooo_path_exists=1;
-        print STDERR "\n";
-    }
-    else {
-        print STDERR ", OK\n";
-    }
-
-    if ( defined($so_svn_server) ) {
-        print STDERR "... check cws path:\t'$so_cws_url'";
-        if  ( svn_path_exists($so_cws_url) ) { 
-            print STDERR "\n";
-            $so_path_exists = 1;
-        }
-        else {
-            print STDERR ", OK\n";
-        }
-    }
-
-    if ( $ooo_path_exists ) {
-        print_error("SVN path '$ooo_cws_url' already exists.\nThis can happen if a previous CWS creation attempt failed before registering the CWS with EIS.\nIf this is the case, please delete the path with:\n\t svn delete -m'CWS-TOOLING: undo broken CWS creation' $ooo_cws_url\n", 0);
-    }
-
-    if ( $so_path_exists ) {
-        print_error("SVN path '$so_cws_url' already exists.\nThis can happen if a previous CWS creation attempt failed before registering the CWS with EIS.\nIf this is the case, please delete the path with:\n\t svn delete -m'CWS-TOOLING: undo broken CWS creation' $so_cws_url\n", 0);
-    }
-
-    if ( $ooo_path_exists || $so_path_exists ) {
-        exit(15);
-    }
-
-    # determine the revision from which the milestone was copied
-    my $ooo_milestone_revision;
-    my $so_milestone_revision;
-
-    $ooo_milestone_revision = svn_milestone_revision($ooo_milestone_url);
-    if ( !$ooo_milestone_revision ) {
-        print_error("Can't retrieve revision for milestone '$milestone', url '$ooo_milestone_url.", 17 );
-    }
-    if ( defined($so_svn_server) ) { 
-        $so_milestone_revision = svn_milestone_revision($so_milestone_url);
-        if ( !$so_milestone_revision ) {
-            print_error("Can't retrieve revision for milestone '$milestone', url '$so_milestone_url.", 17 );
-        }
-    }
+    register_child_workspace($cws, 'hg', $is_promotion);
 
-    my $ooo_master_url;
-    my $so_master_url;
-
-    $ooo_master_url = get_master_url($ooo_svn_server, $cws->master(), $ooo_milestone_revision);
-    if ( defined($so_svn_server) ) { 
-        $so_master_url = get_master_url($so_svn_server, $cws->master(), $so_milestone_revision);
-    }
-
-    my $ooo_short_url = get_short_url($ooo_svn_server, $ooo_master_url);
-    my $ooo_creation_comment = "CWS-TOOLING: create CWS " . $cws->child() . " from $ooo_short_url (milestone: " . $cws->master() . ":$milestone)";
-    # create branches an ooo server and an optional so server
-    print STDERR "... create branch:\t'$ooo_cws_url'";
-    svn_copy($ooo_creation_comment, $ooo_master_url, $ooo_cws_url);
-    if ( defined($so_svn_server) ) { 
-        my $so_short_url = get_short_url($so_svn_server, $so_master_url);
-        my $so_creation_comment = "CWS-TOOLING: create CWS " . $cws->child() . " from $so_short_url (milestone: " . $cws->master() . ":$milestone)";
-        print STDERR "... create branch:\t'$so_cws_url'";
-        svn_copy($so_creation_comment, $so_master_url, $so_cws_url);
-    }
-
-    if ( $is_migration ) {
-        # Set master and milestone
-        $cws->master($master);
-        $cws->milestone($milestone);
-        my $rc = $cws->set_subversion_flag(1);
-        if ( !$rc ) {
-            print_error("Failed to set subversion flag on child workspace '$cws_name'.\nContact EIS administrator!\n", 12);
-        }
-    }
-    else {
-        register_child_workspace($cws, 'svn', $is_promotion);
-    }
     return;
 }
 
-sub do_rebase
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    my $commit_phase = 0;
-    my $milestone;
-
-    # TODO: Switching to a new master dooes work not correctly yet
-
-    if (exists $options_ref->{'help'} || @{$args_ref} != 1) {
-        do_help(['rebase']);
-    }
-    if ( exists($options_ref->{'commit'}) && exists($options_ref->{'milestone'}) ) {
-        print_error("Option -m (--milestone) and -C (--commit) are mutually exclusive.", 0 );
-        do_help(['rebase']);
-    }
-    if ( !exists($options_ref->{'commit'}) && !exists($options_ref->{'milestone'}) ) {
-        print_error("At least one of the options -m (--milestone) or -C (--commit) are required.", 0 );
-        do_help(['rebase']);
-    }
-
-    if ( !svn_version_check() ) {
-        print_error("cws rebase requires svn-1.5.4 or later (merge tracking and bug fixes). Please upgrade your svn client.", 1);
-    }
-
-    my $cws = get_cws_from_environment();
-
-    my $old_masterws = $cws->master();
-    my $new_masterws;
-    my $new_milestone;
-
-    my $workspace = $args_ref->[0];
-
-    if ( ! -d $workspace ) {
-        print_error("Can't find workspace '$workspace': $!", 99);
-    }
-
-    if ( exists($options_ref->{'commit'}) ) {
-        $commit_phase=1;
-        ($new_masterws, $new_milestone) = read_rebase_configuration($workspace);
-    }
-    elsif( exists($options_ref->{'milestone'}) ) {
-        $milestone = $options_ref->{'milestone'};
-        if ( $milestone eq 'latest' ) {
-            my $latest = $cws->get_current_milestone($old_masterws);
-
-            if ( !$latest ) {
-                print_error("Can't determine latest milestone of '$old_masterws' available for rebase.", 22);
-            }
-            $new_masterws  = $old_masterws;
-            $new_milestone = $latest;
-        }
-        else {
-            ($new_masterws, $new_milestone) =  verify_milestone($cws, $milestone);
-        }
-    }
-    else {
-        do_help(['rebase']);
-    }
-
-    if ( $cws->get_scm() eq 'HG' ) {
-        my $child = $cws->child();
-        print_error("cws rebase is not supported for mercurial based childworkspaces", 0);
-        print_error("re-synchronize your CWS with:", 0);
-        print_error("hg pull <master>", 0);
-        print_error("hg merge", 0);
-        print_error("hg commit -m\"$child: merge with $new_masterws $new_milestone\"", 0);
-        print_error("and update EIS with:", 0);
-        print_error("cws setcurrent -m $new_milestone", 99);
-    }
-
-    my $so_setup = 0;
-    my $ooo_path;
-    my $so_path;
-    # Determine if we got a three directory (so) setup or a plain (ooo) setup.
-    # This is only needed as long the build system still relies
-    # on having "modules" from different repositories in the same
-    # directory besides each other.
-    if ( -d "$workspace/$old_masterws/sun" ) {
-        $so_setup = 1;
-        $ooo_path = "$workspace/$old_masterws/ooo";
-        $so_path = "$workspace/$old_masterws/sun";
-    }
-    else {
-        $ooo_path = "$workspace";
-    }
-
-    my $config = CwsConfig->new();
-    my $ooo_svn_server = $config->get_ooo_svn_server();
-    my $so_svn_server = $config->get_so_svn_server();
-
-    if (!defined($ooo_svn_server)) {
-        print_error("No OpenOffice.org SVN server defined, please check your configuration file.", 8);
-    }
-
-    my $ooo_milestone_url = get_milestone_url($ooo_svn_server, $new_masterws, $new_milestone);
-    my $ooo_cws_url = get_cws_url($ooo_svn_server, $cws->child());
-
-    my $so_milestone_url;
-    my $so_cws_url;
-    if ( $so_setup ) { 
-        $so_milestone_url = get_milestone_url($so_svn_server, $new_masterws, $new_milestone);
-        $so_cws_url = get_cws_url($so_svn_server, $cws->child());
-    }
-
-    my $ooo_milestone_revision;
-    my $so_milestone_revision;
-
-    $ooo_milestone_revision = svn_milestone_revision($ooo_milestone_url);
-    if ( !$ooo_milestone_revision ) {
-        print_error("Can't retrieve revision for milestone '$new_milestone', url '$ooo_milestone_url.", 17 );
-    }
-    if ( defined($so_svn_server) ) { 
-        $so_milestone_revision = svn_milestone_revision($so_milestone_url);
-        if ( !$so_milestone_revision ) {
-            print_error("Can't retrieve revision for milestone '$new_milestone', url '$so_milestone_url.", 17 );
-        }
-    }
-
-    my $ooo_master_url;
-    my $so_master_url;
-
-    $ooo_master_url = get_master_url($ooo_svn_server, $new_masterws, $ooo_milestone_revision);
-    if ( defined($so_svn_server) ) { 
-        $so_master_url = get_master_url($so_svn_server, $new_masterws, $so_milestone_revision);
-    }
-
-    if ( $commit_phase ) {
-        # commit
-        print_message("... committing merged changes to workspace '$workspace'.");
-        my $ooo_short_url = get_short_url($ooo_svn_server, $ooo_master_url);
-        my $commit_message = "CWS-TOOLING: rebase CWS " . $cws->child() . " to $ooo_short_url (milestone: " . $new_masterws . ":$new_milestone)";
-        svn_commit($ooo_path, $commit_message);
-        if ( $so_setup ) {
-            my $so_short_url = get_short_url($so_svn_server, $so_master_url);
-            $commit_message = "CWS-TOOLING: rebase CWS " . $cws->child() . " to $so_short_url (milestone: " . $new_masterws . ":$new_milestone)";
-            svn_commit($so_path, $commit_message);
-        }
-        if ( $so_setup) {
-            print_message("... rename '$workspace/$old_masterws' -> '$workspace/$new_masterws'\n");
-            if ( !rename("$workspace/$old_masterws", "$workspace/$new_masterws") ) {
-                print_error("Can't rename '$workspace/$old_masterws' -> '$workspace/$new_masterws': $!", 98);
-            }
-            print_message("... relinking workspace\n");
-            relink_workspace("$workspace/$new_masterws/src.$new_milestone", 1);
-            if ( !unlink("$workspace/REBASE.CONFIG_DONT_DELETE") ) {
-                print_error("Can't unlink '$workspace/REBASE.CONFIG_DONT_DELETE': $!", 0);
-            }
-                
-        }
-
-        print_message("... updating EIS database");
-        my $push_return = $cws->set_master_and_milestone($new_masterws, $new_milestone);
-        # sanity check
-        if ( $$push_return[1] ne $new_milestone) {
-            print_error("Couldn't push new milestone '$new_milestone' to database", 0);
-        }
-    }
-    else {
-        # merge phase
-        
-        # check if working directory is switched to the right cws branch
-        my $ooo_wc_url;
-        my $so_wc_url;
-        my $cwsname = $cws->child();
-        print_message("... verifying if  workspace '$workspace' is switched to CWS '$cwsname'.");
-        $ooo_wc_url = svn_wc_url($ooo_path);
-        if ( $ooo_wc_url !~ /\/$cwsname$/ ) {
-            print_error("Your working copy '$ooo_path' is not switched to the cws branch.\nPlease fix and restart rebasing.", 24);
-        }
-        if ( $so_setup ) {
-            $so_wc_url = svn_wc_url($so_path);
-
-            if ( $so_wc_url !~ /\/$cwsname$/ ) {
-                print_error("Your working copy '$so_path' is not switched to the cws branch.\nPlease fix and restart rebasing.", 24);
-            }
-        }
-        # check for mixed revisions, locally modified files etc
-        if ( !svn_wc_is_clean($ooo_path) || ($so_setup && !svn_wc_is_clean($so_path)) ) {
-            print_error("Please fix and restart rebasing.", 25);
-        }
-
-        print_message("... merging changes up to '$new_masterws:$new_milestone' to workspace '$workspace'.");
-        svn_merge($ooo_milestone_url, $ooo_path);
-        if ( $so_setup ) {
-            svn_merge($so_milestone_url, $so_path);
-        }
-        # write out the rebase configuration to store new milestone and master information
-        write_rebase_configuration($workspace, $cwsname, $new_masterws, $new_milestone); 
-    }
-}
-
-sub do_integrate
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    if (exists $options_ref->{'help'} || @{$args_ref} > 0) {
-        do_help(['integrate']);
-    }
-    if ( exists($options_ref->{'commit'}) && exists($options_ref->{'childworkspace'}) ) {
-        print_error("Option -c (--child) and -C (--commit) are mutually exclusive.", 0 );
-        do_help(['integrate']);
-    }
-}
-
 # Executes the fetch command.
 sub do_fetch
 {
@@ -2150,11 +1590,6 @@ sub do_fetch
         do_help(['fetch']);
     }
 
-    if ( defined($platforms) && $switch ) {
-        print_error("Option '-p' is not usuable with Option '-s'.", 0);
-        do_help(['fetch']);
-    }
-
     if ( $onlysolver && !defined($platforms) ) {
         print_error("Option '-o' is Only usuable combination with option '-p'.", 0);
         do_help(['fetch']);
@@ -2167,7 +1602,6 @@ sub do_fetch
     }
     $cws->master($masterws);
     my $milestone;
-    my $scm;
     if( defined($milestone_opt) ) {
         if ( $milestone_opt eq 'latest' ) {
             $cws->master($masterws);
@@ -2181,29 +1615,19 @@ sub do_fetch
         else {
             ($masterws, $milestone) =  verify_milestone($cws, $milestone_opt);
         }
-        $scm = get_scm_for_milestone($masterws, $milestone);
     }
     elsif ( defined($child) ) {
         $cws = get_cws_by_name($child);
         $masterws = $cws->master(); # CWS can have another master than specified in ENV
         $milestone = $cws->milestone();
-        $scm = $cws->get_scm();
     }
     else {
         do_help(['fetch']);
     }
 
-    if ( $switch && $scm eq 'HG' ) {
-        print_error("Option '-s' is not supported with a hg based CWS.", 0);
-        do_help(['fetch']);
-    }
-
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: SCM: $scm\n";
-    }
-
     my $config = CwsConfig->new();
-    my $ooo_svn_server = $config->get_ooo_svn_server();
+    # $so_svn_server is still required to determine if we are in SO environment
+    # TODO: change this configuration setting to something more meaningful
     my $so_svn_server = $config->get_so_svn_server();
     my $prebuild_dir = $config->get_prebuild_binaries_location();
     my $external_tarball_source = $prebuild_dir;
@@ -2262,111 +1686,43 @@ sub do_fetch
     my $workspace = $args_ref->[0];
 
     if ( !$onlysolver ) {
-        my $url_suffix = $milestone_opt ? ("/tags/$masterws" . "_$milestone") : ('/cws/' . $cwsname);
-        if ( $switch ) {
-            # check if to be switched working copy exist or bail out
-            if ( ! -d $workspace ) {
-                print_error("Can't open workspace '$workspace': $!", 21);
-            }
-    
-            my $so_setup = 0;
-            my $ooo_path;
-            my $so_path;
-            # Determine if we got a three directory (so) setup or a plain (ooo) setup.
-            # This is only needed as long the build system still relies
-            # on having "modules" from different repositories in the same
-            # directory besides each other.
-            if ( -d "$workspace/$masterws/sun" ) {
-                $so_setup = 1;
-                $ooo_path = "$workspace/$masterws/ooo";
-                $so_path = "$workspace/$masterws/sun";
-            }
-            else {
-                $ooo_path = "$workspace";
-            }
-
-            # get the working copy URLs
-            my $ooo_new_url = svn_wc_root($ooo_path) . $url_suffix;
-            my $so_new_url;
-            if ( $so_setup ) {
-                $so_new_url = svn_wc_root($so_path) . $url_suffix;
-            }
-
-            print_message("... switching '$ooo_path' to URL '$ooo_new_url'");
-            svn_switch($ooo_path, $ooo_new_url, $quiet);
-            # switch working copies
-            if ( $so_setup ) {
-                print_message("... switching '$so_path' to URL '$so_new_url'");
-                svn_switch($so_path, $so_new_url, $quiet);
-            }
-
-            if ( $so_setup ) {
-                relink_workspace("$workspace/$masterws/$linkdir", 0);
-            }
+        if ( -e $workspace ) {
+            print_error("File or directory '$workspace' already exists.", 8);
         }
-        else {
-            if (!defined($ooo_svn_server)) {
-                print_error("No OpenOffice.org SVN server defined, please check your configuration file.", 8);
-            }
 
-            my $ooo_url = $ooo_svn_server . $url_suffix;
-            if ( -e $workspace ) {
-                print_error("File or directory '$workspace' already exists.", 8);
+        my $clone_milestone_only = $milestone_opt ? $milestone : 0;
+        if ( defined($so_svn_server) ) {
+            if ( !mkdir($workspace) ) {
+                print_error("Can't create directory '$workspace': $!.", 8);
             }
-
-            if ( !(($scm eq 'SVN') || ($scm eq 'HG')) ) {
-                print_error("Unsupported SCM '$scm'.", 8);
+            my $work_master = "$workspace/$masterws";
+            if ( !mkdir($work_master) ) {
+                print_error("Can't create directory '$work_master': $!.", 8);
             }
-
-            my $clone_milestone_only = $milestone_opt ? $milestone : 0;
-            if ( defined($so_svn_server) ) {
-                if ( !mkdir($workspace) ) {
-                    print_error("Can't create directory '$workspace': $!.", 8);
-                }
-                my $work_master = "$workspace/$masterws";
-                if ( !mkdir($work_master) ) {
-                    print_error("Can't create directory '$work_master': $!.", 8);
-                }
-                if ( $scm eq 'SVN' ) {
-                    print_message("... checkout '$ooo_url' to '$work_master/ooo'");
-                    svn_checkout($ooo_url, "$work_master/ooo", $quiet);
-                    my $so_url = $so_svn_server . $url_suffix;
-                    print_message("... checkout '$so_url' to '$work_master/sun'");
-                    svn_checkout($so_url, "$work_master/sun", $quiet);
-                }
-                else{
-                    hg_clone_cws_or_milestone('ooo', $cws, "$work_master/ooo", $clone_milestone_only); 
-                    hg_clone_cws_or_milestone('so', $cws, "$work_master/sun", $clone_milestone_only);
-                }
-                if ( get_source_config_for_milestone($masterws, $milestone) ) {
-                    # write source_config file
-                    my $source_config_file = "$work_master/source_config";
-                    if ( !open(SOURCE_CONFIG, ">$source_config_file") ) {
-                        print_error("Can't create source_config file '$source_config_file': $!.", 8);
-                    }
-                    print SOURCE_CONFIG "[repositories]\n";
-                    print SOURCE_CONFIG "ooo=active\n";
-                    print SOURCE_CONFIG "sun=active\n";
-                    close(SOURCE_CONFIG);
-                }
-                else {
-                    my $linkdir = "$work_master/src.$milestone";
-                    if ( !mkdir($linkdir) ) {
-                        print_error("Can't create directory '$linkdir': $!.", 8);
-                    }
-                    relink_workspace($linkdir);
+            hg_clone_cws_or_milestone('ooo', $cws, "$work_master/ooo", $clone_milestone_only); 
+            hg_clone_cws_or_milestone('so', $cws, "$work_master/sun", $clone_milestone_only);
+            if ( get_source_config_for_milestone($masterws, $milestone) ) {
+                # write source_config file
+                my $source_config_file = "$work_master/source_config";
+                if ( !open(SOURCE_CONFIG, ">$source_config_file") ) {
+                    print_error("Can't create source_config file '$source_config_file': $!.", 8);
                 }
+                print SOURCE_CONFIG "[repositories]\n";
+                print SOURCE_CONFIG "ooo=active\n";
+                print SOURCE_CONFIG "sun=active\n";
+                close(SOURCE_CONFIG);
             }
             else {
-                if ( $scm eq 'SVN' ) {
-                    print_message("... checkout '$ooo_url' to '$workspace'");
-                    svn_checkout($ooo_url, $workspace, $quiet);
-                }
-                else {
-                    hg_clone_cws_or_milestone('ooo', $cws, $workspace, $clone_milestone_only);
+                my $linkdir = "$work_master/src.$milestone";
+                if ( !mkdir($linkdir) ) {
+                    print_error("Can't create directory '$linkdir': $!.", 8);
                 }
+                relink_workspace($linkdir);
             }
         }
+        else {
+            hg_clone_cws_or_milestone('ooo', $cws, $workspace, $clone_milestone_only);
+        }
     }
 
     if ( !$onlysolver && defined($external_tarball_source) ) {
@@ -2516,91 +1872,6 @@ sub do_task
     return;
 }
 
-sub do_cdiff
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    if ( exists $options_ref->{'help'} || @{$args_ref} != 0) {
-        do_help(['cdiff']);
-    }
-
-    my $files   = exists $options_ref->{'files'}   ? 1 : 0;
-    my $modules = exists $options_ref->{'modules'} ? 1 : 0;
-
-    if ( $files && $modules ) {
-        print_error("Options --files and --modules are mutally exclusive", 0);
-        do_help(['cdiff']);
-    }
-
-    my $diff_option;
-    if ( $files ) {
-        $diff_option = 'files';
-    }
-    elsif ( $modules ) {
-        $diff_option = 'modules';
-    }
-    else {
-        $diff_option = 0;
-    }
-
-
-    my $masterws  = exists $options_ref->{'masterworkspace'} ? uc($options_ref->{'masterworkspace'}) : $ENV{WORK_STAMP};
-    my $childws   = exists $options_ref->{'childworkspace'} ? $options_ref->{'childworkspace'} : $ENV{CWS_WORK_STAMP};
-
-    if ( !defined($masterws) ) {
-        print_error("Can't determine master workspace environment.\n", 30);
-    }
-    
-    if ( !defined($childws) ) {
-        print_error("Can't determine child workspace environment.\n", 30);
-    }
-
-    my $cws = Cws->new();
-    $cws->child($childws);
-    $cws->master($masterws);
-    
-    if ( !is_valid_cws($cws) ) {
-        print_error("'$childws' is not a valid CWS name.\n", 30);
-    }
-
-    if ( $cws->get_scm() eq 'HG' ) {
-        print_error("cws cdiff is not supported for mercurial based childworkspaces", 80);
-    }
-    my $milestone = $cws->milestone();
-    
-    my $config = CwsConfig->new();
-    my $ooo_svn_server = $config->get_ooo_svn_server();
-    my $so_svn_server = $config->get_so_svn_server();
-
-    my $ooo_milestone_url = get_milestone_url($ooo_svn_server, $masterws, $milestone);
-    my $ooo_cws_url = get_cws_url($ooo_svn_server, $childws);
-    my $ooo_files;
-    if ( $diff_option  ) {
-        $ooo_files = svn_diff($ooo_milestone_url, $ooo_cws_url, $diff_option);
-        diff_print_files($ooo_files, $diff_option);
-    }
-    else {
-        svn_diff($ooo_milestone_url, $ooo_cws_url, 0);
-    }
-
-    my $so_files;
-    if ( $so_svn_server ) { 
-        my $so_milestone_url = get_milestone_url($so_svn_server, $masterws, $milestone);
-        my $so_cws_url = get_cws_url($so_svn_server, $childws);
-        if  ( svn_path_exists($so_cws_url) ) { 
-            if ( $diff_option ) {
-                $so_files = svn_diff($so_milestone_url, $so_cws_url, $diff_option);
-                diff_print_files($so_files, $diff_option);
-            }
-            else {
-                svn_diff($so_milestone_url, $so_cws_url, 0);
-            }
-        }
-    }
-
-}
-
 sub do_setcurrent
 {
     my $args_ref    = shift;
@@ -2685,347 +1956,6 @@ sub usage
         print STDERR "Type 'cws help' for usage.\n";
 }
 
-### SVN glue ###
-
-# TODO: is it a better idea to use the SVN bindings?
-# pro: 
-#       - SVN make guarantees about API stability but no about the command line
-#       - finer access to the SVN functionality, better error reporting
-#       - prevents parsing errors due to localized SVN messages
-# con: 
-#       - the bindings are difficult to install, mostly due to subtle install bugs
-#       - we do not really use much of the SVN functionality here
-
-sub svn_wc_is_clean
-{
-    my $wc_path = shift;
-
-    my $result = execute_svnversion_command($wc_path);
-
-    my $error = 0;
-
-    if ( $result =~ /:/ ) {
-        print_error("Working copy '$wc_path' contains mixed revisions. Please run 'svn update'!", 0);
-        $error++;
-    }
-    if ( $result =~ /M/ ) {
-        print_error("Working copy '$wc_path' contains locally modified files. Please commit or revert all modified files.", 0);
-        $error++;
-    }
-    if ( $result =~ /S/ ) {
-        print_error("Working copy '$wc_path' is partially switched. The whole working copy needs to be switched to the CWS branch.", 0);
-        $error++;
-    }
-    if ( $result =~ /P/ ) {
-        print_error("Working copy '$wc_path' is only partially checked out. CWS tools can't work on partially checked out working copies.", 0);
-        $error++;
-    }
-
-    return !$error;
-}
-
-sub svn_version_check
-{
-    my $major_required = 1;
-    my $minor_required = 5;
-    my $patchlevel_required = 4;
-
-    my $version_required = $major_required*1000000 + $minor_required*1000 + $patchlevel_required;
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... svn version\n";
-    }
-
-    my @result = execute_svn_command(0, '--version --quiet', " ");
-    # svn --version --quiet returns the version in major.minor.patchlevel scheme
-    # for example: 1.5.4 or 1.6.0-dev (for developer codelines)
-    # hopefully they don't change the versioning scheme
-    my ($major, $minor, $patchlevel);
-    if ( $result[0] =~ /^(\d+)\.(\d+)\.(\d+)/ ) {
-        $major       = $1;
-        $minor       = $2;
-        $patchlevel  = $3;
-    }
-    else {
-        print_error("Can't determine svn version. Please file an issue with the output of 'svn --version --quiet'. CWS tooling requires svn-1.5.4 or later\n", 1)
-    }
-
-    my $version =  $major*1000000 + $minor*1000 + $patchlevel;
-
-    if ( $version < $version_required ) {
-        return 0;
-    }
-    return 1;
-}
-
-sub svn_copy
-{
-    my $comment = shift;
-    my $source = shift;
-    my $dest = shift;
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... preparing branch: '$source' -> '$dest'\n";
-    }
-
-    my @result = execute_svn_command(0, 'copy', "-m '$comment'", $source, $dest);
-    if ( $result[1] =~ /Committed revision (\d+)\./ ) {
-        print STDERR ", committed revision $1\n";
-    } else {
-        print STDERR "failed!\n";
-        print STDERR @result;
-    }
-}
-
-sub svn_milestone_revision
-{
-    my $milestone_url = shift;
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... preparing log --stop-on-copy: '$milestone_url'\n";
-    }
-
-    my @result = execute_svn_command(0, 'log', '--stop-on-copy', $milestone_url);
-
-    # There might be revisions committed to a tag (allowed in subversion).
-    # The lowestmost revision listed in a 'log --stop-on-copy' is the one which
-    # was current when the tag was created
-    my $revision = 0;
-    foreach ( @result ) {
-        if ( /^r(\d+)\s+\|\s+/ ) {
-            $revision = $1;
-        }
-    }
-
-    return $revision;
-}
-
-sub svn_path_exists
-{
-    my $url = shift;
-
-    my @result = svn_info($url);
-
-    foreach ( @result ) {
-        if ( /^Path: / ) {
-            return 1;
-        }
-    }
-    return 0;
-}
-
-sub svn_wc_url
-{
-    my $wc_path = shift;
-
-    my @result = svn_info($wc_path);
-
-    foreach ( @result ) {
-        if ( /^URL: (.+)$/ ) {
-            return $1;
-        }
-    }
-
-    print_error("Can't retrieve svn info from working copy '$wc_path'\n", 23);
-}
-
-sub svn_wc_root
-{
-    my $wc_path = shift;
-
-    my @result = svn_info($wc_path);
-
-    foreach ( @result ) {
-        if ( /^Repository Root: (.+)$/ ) {
-            return $1;
-        }
-    }
-
-    print_error("Can't retrieve svn info from working copy '$wc_path'\n", 23);
-}
-
-sub svn_info
-{
-    my $url = shift;
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... preparing info: '$url'\n";
-    }
-
-    my @result = execute_svn_command(0, 'info', '--depth empty', $url);
-    return @result;
-}
-
-sub svn_merge
-{
-    my $url = shift;
-    my $wc  = shift;
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... preparing merge: '$url -> $wc'\n";
-    }
-
-    my $log_file = "$wc/REBASE.LOG";
-    my @result = execute_svn_command($log_file, 'merge', '--accept postpone', $url, $wc);
-    return @result;
-}
-
-sub svn_switch
-{
-    my $wc  = shift;
-    my $url = shift;
-    my $quiet = shift;
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... preparing switch: '$url -> $wc'\n";
-    }
-
-    my $switch = $quiet ? 'switch --quiet' : 'switch';
-
-    my @result = execute_svn_command('print', $switch, $url, $wc);
-    return @result;
-}
-
-sub svn_checkout
-{
-    my $url   = shift;
-    my $wc    = shift;
-    my $quiet = shift;
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... preparing checkout: '$url -> $wc'\n";
-    }
-
-    my $checkout = $quiet ? 'checkout --quiet' : 'checkout';
-
-    my @result = execute_svn_command('print', $checkout, $url, $wc);
-    return @result;
-}
-
-sub svn_commit
-{
-    my $wc             = shift;
-    my $commit_message = shift;
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... preparing commit: '$wc'\n";
-    }
-
-    my $log_file = "$wc/REBASE.LOG";
-    my @result = execute_svn_command($log_file, 'commit', "-m '$commit_message'", $wc);
-    return @result;
-}
-
-sub svn_diff
-{
-    my $url1 = shift;
-    my $url2 = shift;
-    my $diff_option = shift;
-
-    my $summarize = '';
-    if ( $diff_option ) {
-        $summarize = '--summarize';
-    }
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... preparing diff $summarize: '$url1' vs. '$url2'\n";
-    }
-
-    if ( $summarize ) {
-        my $result = execute_svn_command(0, 'diff', $summarize, $url1, $url2);
-        my $nlen = length($url1);
-        my @files;
-        foreach( @{$result} ) {
-            my ($dummy, $url) = split();
-            next if length($url) <= $nlen;   # skip short URLs (like $url1) 
-            my $file = substr($url, $nlen+1);
-            next if index($file, '/') == -1; # skip 'modified' top level dirs
-            push (@files, $file);
-        }
-        return \@files;
-    }
-    else {
-        execute_svn_command('print', 'diff', $url1, $url2);
-    }
-}
-
-sub execute_svn_command
-{
-    my $log     = shift;
-    my $command = shift;
-    my $options = shift;
-    my @args    = @_;
-
-    my $args_str = join(" ", @args);
-
-    # we can only parse english strings, hopefully a C locale is available everywhere
-    $ENV{LC_ALL}='C';
-    $command = "svn $command $options $args_str";
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... execute command line: '$command'\n";
-    }
-
-    my @result;
-    my $date;
-    if ( $log && $log ne 'print') {
-        open(LOG, ">>$log") or print_error("can't open log file '$log'", 30);
-        $date = localtime();
-        print LOG "Start $command $args_str at $date\n";
-    }
-    open(OUTPUT, "$command 2>&1 |") or print_error("Can't execute svn command line client", 98);
-    STDOUT->autoflush(1) if $log;
-    while (<OUTPUT>) {
-        if ( $log ) {
-            print STDOUT $_;
-            print LOG $_ if $log ne 'print';
-        }
-        else {
-            push(@result, $_);
-        }
-    }
-    STDOUT->autoflush(0) if $log;
-    close(OUTPUT);
-    if ( $log && $log ne 'print') {
-        $date = localtime();
-        print LOG "Stop $command $args_str at $date\n";
-        close (LOG);
-    }
-    
-    my $rc = $? >> 8;
-
-    if ( $rc > 0) {
-        print STDERR "\n";
-        print STDERR @result if !$log;
-        print_error("The subversion command line client failed with exit status '$rc'", 99);
-    }
-    return wantarray ? @result : \@result;
-}
-
-sub execute_svnversion_command
-{
-    my $options = shift;
-    my @args    = @_;
-
-    my $args_str = join(" ", @args);
-
-    # we can only parse english strings, hopefully a C locale is available everywhere
-    $ENV{LC_ALL}='C';
-    $command = "svnversion $options $args_str";
-
-    if ( $debug ) {
-        print STDERR "\nCWS-DEBUG: ... execute command line: '$command'\n";
-    }
-
-    my $result = `$command`;
-    my $rc = $? >> 8;
-    if ($rc > 0) {
-        print_error("The subversion command line tool 'svnversion' failed with exit status '$rc'", 99);
-    }
-
-    return $result;
-}
-
 ### HG glue ###
 
 sub hg_clone
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
index 7f52218c5..8ce9753a4 100755
--- a/solenv/bin/gccinstlib.pl
+++ b/solenv/bin/gccinstlib.pl
@@ -53,4 +53,13 @@ foreach $Src (@CopySrc) {
     system ("/bin/cp $Src $Dest") && die "copy failed: $!";
 }
 
+
+foreach $File (@ARGV) {
+    #https://bugzilla.redhat.com/show_bug.cgi?id=149465
+    printf "unprelinking $Dest/$File\n";
+    #If it's already unprelinked .i.e. no .gnu.prelink_undo section, that's fine
+    #If prelink is not installed, it's massively unlikely that it's prelinked
+    system ("prelink -u $Dest/$File > /dev/null 2>&1");
+}
+
 exit (0);
diff --git a/solenv/bin/jpropex b/solenv/bin/jpropex
new file mode 100755
index 000000000..2d62d13b0
--- /dev/null
+++ b/solenv/bin/jpropex
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ x${SOLARENV}x = xx ]; then
+    echo No environment found, please use 'configure' or 'setsolar'
+    exit 1
+fi
+if [ x${JAVA_HOME}x = xx ]; then
+    echo No Java found!
+    exit 1
+fi
+exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL=  -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/jpropex.jar "$@"
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index bf8fcd633..726e0921f 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -45,7 +45,7 @@ sub action($$$)
          'shl/OOO/OOO' => '@loader_path',
          'shl/OXT/URELIB' => '@executable_path/urelibs',
          'shl/BOXT/URELIB' => '@executable_path/urelibs',
-         'shl/BOXT/OOO' => '@loader_path/../../../../../../basis-link/program',
+         'shl/BOXT/OOO' => '@loader_path/../../../basis-link/program',
          'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
          'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
          'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__');
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index ffcbe7e6e..b7636ca61 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -93,6 +93,54 @@ sub get_patch_file_list
 }
 
 #################################################################
+# Reading all executables in the "manifest.xml"
+#################################################################
+
+sub get_all_executables_from_manifest
+{
+    my ($unzipdir, $manifestfile, $executable_files_in_extensions) = @_;
+    
+    my $is_executable = 0;
+    
+    for ( my $i = 0; $i <= $#{$manifestfile}; $i++ )
+    {
+        my $line = ${$manifestfile}[$i];
+        
+        if ( $line =~ /\"application\/vnd\.sun\.star\.executable\"/ ) { $is_executable = 1; }
+
+        if (( $line =~ /manifest\:full\-path=\"(.*?)\"/ ) && ( $is_executable ))
+        {
+            my $filename = $unzipdir . $installer::globals::separator . $1;
+            # making only slashes for comparison reasons
+            $filename =~ s/\\/\//g;
+            $executable_files_in_extensions->{$filename} = 1;
+        }
+
+        if ( $line =~ /\/\>/ ) { $is_executable = 0; }
+    }
+}
+
+#################################################################
+# Reading the "manifest.xml" in extensions and determine, if
+# there are executable files
+#################################################################
+
+sub collect_all_executable_files_in_extensions
+{
+    my ($unzipdir, $executable_files_in_extensions) = @_;
+    
+    $unzipdir =~ s/\Q$installer::globals::separator\E\s*$//;
+        
+    my $manifestfilename = $unzipdir . $installer::globals::separator . "META-INF" . $installer::globals::separator . "manifest.xml";
+
+    if ( -f $manifestfilename )
+    {
+        my $manifestfile = installer::files::read_file($manifestfilename);
+        get_all_executables_from_manifest($unzipdir, $manifestfile, $executable_files_in_extensions);		
+    }
+}
+
+#################################################################
 # Analyzing files with flag ARCHIVE
 #################################################################
 
@@ -141,6 +189,10 @@ sub resolving_archive_flag
             my $rename_to_language = 0;			
             if ( $styles =~ /\bRENAME_TO_LANGUAGE\b/ ) { $rename_to_language = 1; }	# special handling for renamed files (scriptitems.pm)
 
+            my %executable_files_in_extensions = ();
+            my $set_executable_privileges = 0;  # setting privileges for exectables is required for oxt files
+            if ( $onefile->{'Name'} =~ /\.oxt\s*$/ ) { $set_executable_privileges = 1; }					
+
             # mechanism to select files from an archive files
             my $select_files = 0;
             my $selectlistfiles = "";
@@ -260,6 +312,12 @@ sub resolving_archive_flag
                             push( @installer::globals::logfileinfo, $infoline);
                         }
                     }
+                    
+                    # Selecting names of executable files in extensions
+                    if ( $set_executable_privileges )
+                    {
+                        collect_all_executable_files_in_extensions($unzipdir, \%executable_files_in_extensions);
+                    }
                 }
     
                 my $zipfileref = \@zipfile;
@@ -313,6 +371,19 @@ sub resolving_archive_flag
                             push( @installer::globals::logfileinfo, $infoline);		
                         }
                         
+                        if ( $set_executable_privileges )
+                        {
+                            # All pathes to executables are saved in the hash %executable_files_in_extensions
+                            my $compare_path = $newfile{'sourcepath'};
+                            $compare_path =~ s/\\/\//g;  # contains only slashes for comparison reasons
+                            if ( exists($executable_files_in_extensions{$compare_path}) )
+                            {
+                                $newfile{'UnixRights'} = "775";
+                                $infoline = "Executable in Extension: Setting unix rights for \"$newfile{'sourcepath'}\" to \"$newfile{'UnixRights'}\"\n";
+                                push( @installer::globals::logfileinfo, $infoline);
+                            }
+                        }
+                        
                         if ( $select_files )
                         {
                             if ( ! installer::existence::exists_in_array($zipname,$selectlistfiles) )
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 1251966b5..b833cc0c6 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -62,6 +62,21 @@ sub check_simple_packager_project
 }
 
 ####################################################
+# Detecting the directory with extensions
+####################################################
+
+sub get_extensions_dir
+{
+    my ( $subfolderdir ) = @_;
+    
+    my $extensiondir = $subfolderdir . $installer::globals::separator;
+    if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; }
+    $extensiondir = $extensiondir . "share" . $installer::globals::separator . "extensions";
+    
+    return $extensiondir;	
+}
+
+####################################################
 # Registering extensions
 ####################################################
 
@@ -774,9 +789,16 @@ sub create_simple_package
         
     # Registering the extensions
 
-    installer::logger::print_message( "... registering extensions ...\n" );
-    installer::logger::include_header_into_logfile("Registering extensions:");
-    register_extensions($subfolderdir, $languagestringref);
+    # installer::logger::print_message( "... registering extensions ...\n" );
+    # installer::logger::include_header_into_logfile("Registering extensions:");
+    # register_extensions($subfolderdir, $languagestringref);
+
+    installer::logger::print_message( "... removing superfluous directories ...\n" );
+    installer::logger::include_header_into_logfile("Removing superfluous directories:");
+    
+    my $extensionfolder = get_extensions_dir($subfolderdir);
+    
+    installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
 
     if ( $installer::globals::compiler =~ /^unxmacx/ )
     {
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index f29138e9e..9aa1947ad 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -1664,4 +1664,51 @@ sub read_full_directory {
     return 
 }
 
+##############################################################
+# Removing all empty directories below a specified directory
+##############################################################
+
+sub remove_empty_dirs_in_folder
+{
+    my ( $dir ) = @_;
+
+    my @content = ();
+    my $infoline = "";
+    
+    $dir =~ s/\Q$installer::globals::separator\E\s*$//;
+
+    if ( -d $dir )
+    {
+        opendir(DIR, $dir);
+        @content = readdir(DIR);
+        closedir(DIR);
+
+        my $oneitem;
+    
+        foreach $oneitem (@content)
+        {
+            if ((!($oneitem eq ".")) && (!($oneitem eq "..")))
+            {
+                my $item = $dir . $installer::globals::separator . $oneitem;
+
+                if ( -d $item ) # recursive
+                {
+                    remove_empty_dirs_in_folder($item);
+                }
+            }
+        }
+        
+        # try to remove empty directory		
+        my $returnvalue = rmdir $dir;
+
+        if ( $returnvalue )
+        {
+            $infoline = "Successfully removed empty dir $dir\n";
+            push(@installer::globals::logfileinfo, $infoline);
+        }
+        
+    }
+    
+}
+
 1;
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 168eaf607..2e3074742 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -436,6 +436,8 @@ sub copy_files_into_directory_structure
 {
     my ($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash) = @_;
 
+    my $unopkgfile = "";
+
     for ( my $i = 1; $i <= $maxsequence; $i++ )
     {
         if ( exists($fileorder->{$i}) )
@@ -485,7 +487,9 @@ sub copy_files_into_directory_structure
                 push(@installer::globals::logfileinfo, $infoline);
                 installer::exiter::exit_program($infoline, "copy_files_into_directory_structure");
             }
-            
+
+            if ( $destfile =~ /unopkg\.exe\s*$/ ) { $unopkgfile = $destfile; }
+
             # installer::systemactions::copy_one_file($sourcefile, $destfile);
         }
         # else	# allowing missing sequence numbers ?
@@ -493,6 +497,8 @@ sub copy_files_into_directory_structure
         # 	installer::exiter::exit_program("ERROR: No file assigned to sequence $i", "copy_files_into_directory_structure");
         # }
     }
+    
+    return $unopkgfile;
 }
 
 
@@ -742,6 +748,68 @@ sub write_sis_info
     }	
 }
 
+####################################################
+# Detecting the directory with extensions
+####################################################
+
+sub get_extensions_dir
+{
+    my ( $unopkgfile ) = @_;
+    
+    my $localbranddir = $unopkgfile;
+    installer::pathanalyzer::get_path_from_fullqualifiedname(\$localbranddir); # "program" dir in brand layer
+    installer::pathanalyzer::get_path_from_fullqualifiedname(\$localbranddir); # root dir in brand layer
+    $localbranddir =~ s/\Q$installer::globals::separator\E\s*$//;
+    my $extensiondir = $localbranddir . $installer::globals::separator . "share" . $installer::globals::separator . "extensions";
+    
+    return $extensiondir;	
+}
+
+##############################################################
+# Removing all empty directories below a specified directory
+##############################################################
+
+sub remove_empty_dirs_in_folder
+{
+    my ( $dir, $firstrun ) = @_;
+
+    if ( $firstrun )
+    {
+        print "Removing superfluous directories\n";
+    }
+
+    my @content = ();
+    
+    $dir =~ s/\Q$installer::globals::separator\E\s*$//;
+
+    if ( -d $dir )
+    {
+        opendir(DIR, $dir);
+        @content = readdir(DIR);
+        closedir(DIR);
+
+        my $oneitem;
+    
+        foreach $oneitem (@content)
+        {
+            if ((!($oneitem eq ".")) && (!($oneitem eq "..")))
+            {
+                my $item = $dir . $installer::globals::separator . $oneitem;
+
+                if ( -d $item ) # recursive
+                {
+                    remove_empty_dirs_in_folder($item, 0);
+                }
+            }
+        }
+        
+        # try to remove empty directory	
+        my $returnvalue = rmdir $dir;
+
+        # if ( $returnvalue ) { print "Successfully removed empty dir $dir\n"; }	
+    }
+}
+
 ####################################################################################
 # Simulating an administrative installation
 ####################################################################################
@@ -813,11 +881,18 @@ sub make_admin_install
     my $fullpathhash = create_directory_structure($dirhash, $targetdir);
 
     # Copying files
-    copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash);
+    my $unopkgfile = copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash);
     
     my $msidatabase = $targetdir . $installer::globals::separator . $databasefilename;
     installer::systemactions::copy_one_file($databasepath, $msidatabase);
     
+    if ( $unopkgfile ne "" )
+    {
+        # Removing empty dirs in extension folder
+        my $extensionfolder = get_extensions_dir($unopkgfile);
+        if ( -d $extensionfolder ) { remove_empty_dirs_in_folder($extensionfolder, 1); }
+    }
+    
     # Editing registry table because of wrong Property value
     #	my $registryfilename = $helperdir . $installer::globals::separator . "Registry.idt";
     #	my $componentfilename = $helperdir . $installer::globals::separator . "Component.idt";
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index d04a87c59..3e80e1460 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -8,7 +8,7 @@ common
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
 			BUILD_SPECIAL TRUE
-			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
+			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
 			common_build TRUE
 			COMMON_OUTDIR common
 			CONFIG_PROJECT config_office
diff --git a/solenv/inc/ant.properties b/solenv/inc/ant.properties
index 403739579..b2c0f748e 100644
--- a/solenv/inc/ant.properties
+++ b/solenv/inc/ant.properties
@@ -1,3 +1,4 @@
+# x-no-translate
 build.bin=${build.dir}/bin
 build.class=${build.dir}/class
 build.inc=${build.dir}/inc
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 7237832e1..09b6df9d3 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -344,7 +344,11 @@ HUNSPELLLIB=$(HUNSPELL_LIBS)
 .ELSE
 HUNSPELLLIB=-lhunspell-1.2
 .ENDIF
-MYTHESLIB=-lmythes
+.IF "$(SYSTEM_MYTHES)" == "YES"
+MYTHESLIB=$(MYTHES_LIBS)
+.ELSE
+MYTHESLIB=-lmythes-1.2
+.ENDIF
 PYUNOLIB=-lpyuno
 LPSOLVELIB=-llpsolve55
 SOFFICELIB=-lsofficeapp
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 519831ffb..42eb91b48 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m83(Build:9511)
-BUILD=9511
-LAST_MINOR=m83
+RSCREVISION=300m84(Build:9512)
+BUILD=9512
+LAST_MINOR=m84
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index ccd8f929d..c5283fb1b 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -865,7 +865,7 @@ SCPDEFS+=-DUDK_MAJOR=$(UDK_MAJOR)
 SCPDEFS+=-U$(COMID) -DCOMID=$(COMID) -DCOMNAME=$(COMNAME) -D_$(COMID)
 SCPDEFS+=-DCCNUMVER=$(CCNUMVER)
 .IF "$(COM)"=="GCC"
-SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3)
+SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3) -DSHORTSTDC3=$(SHORTSTDC3)
 .ENDIF			# "$(SHORTSTDCPP3)"!=""
 # extend library path for OS/2 gcc/wlink
 .IF "$(GUI)"=="OS2"
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 0319e92f3..1a4ad6e18 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1461,6 +1461,7 @@ COMPVTMP:=$(mktmp iii)
     @echo COMID:=$(COMID) >> $(COMPVTMP)
 .IF "$(COM)"=="GCC"
     @echo SHORTSTDCPP3:=$(SHORTSTDCPP3) >> $(COMPVTMP)
+    @echo SHORTSTDC3:=$(SHORTSTDC3) >> $(COMPVTMP)
 .ENDIF
     @echo CCNUMVER:=$(CCNUMVER) >> $(COMPVTMP)
     @echo CCVER:=$(CCVER:s/-/ /:1) >> $(COMPVTMP)
@@ -2041,6 +2042,7 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
 .ENDIF          # "$(SOLAR_JAVA)"!=""
 
 .INCLUDE : tg_merge.mk
+.INCLUDE : tg_propmerge.mk
 
 wordcount:
     wc *.* >> $(TMP)/wc.lst
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 821888752..c68ae5af4 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -77,6 +77,7 @@ COMNAME=msci
 .IF "$(COM)"=="GCC"
 
 SHORTSTDCPP3:=
+SHORTSTDC3:="1"
 
 .IF "$(CCNUMVER)">="000200910000"
 COMID=GCC
@@ -101,6 +102,19 @@ SHORTSTDCPP3="5"
 .ENDIF
 
 .IF "$(CCNUMVER)">="000300040000"
+.IF "$(OS)$(CPU)" == "LINUX6" || "$(OS)$(CPU)" == "LINUXH"
+#for gcc >= 3.4.0 on m68k-linux this is libgcc_s.so.2.
+#for gcc >= 3.4.0 < 4.2.0 on hppa-linux this is libgcc_s.so.2.
+SHORTSTDC3:="2"
+.ENDIF
+SHORTSTDCPP3="6"
+.ENDIF
+
+.IF "$(CCNUMVER)">="000400020000"
+.IF "$(OS)$(CPU)" == "LINUXH"
+#for gcc >= 4.2.0 on hppa-linux this is libgcc_s.so.4.
+SHORTSTDC3:="4"
+.ENDIF
 SHORTSTDCPP3="6"
 .ENDIF
 
diff --git a/solenv/inc/tg_propmerge.mk b/solenv/inc/tg_propmerge.mk
new file mode 100755
index 000000000..796bca982
--- /dev/null
+++ b/solenv/inc/tg_propmerge.mk
@@ -0,0 +1,66 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+.IF "$(L10NPROPERTYFILES)"!=""
+ALLTAR : $(MISC)/$(TARGET).pmerge.mk $(L10NPROPERTYFILES)
+
+$(MISC)/$(TARGET).pmerge.mk :  $(L10NPROPERTYFILES)
+
+$(L10NPROPERTYFILES) : $(LOCALIZESDF)
+
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).pmerge.mk
+
+.IF "$(alllangiso)"!="$(last_merge)"
+MERGEPHONY:=.PHONY
+.ENDIF          # "$(alllangiso)" != "$(last_merge)"
+
+$(CLASSDIR)/$(PACKAGE)/%.properties $(MERGEPHONY) : %.properties
+    @@-$(MKDIRHIER) $(@:d)
+.IF "$(WITH_LANG)"==""
+    $(COMMAND_ECHO)$(COPY) $< $@
+.ELSE          # "$(WITH_LANG)"==""
+    @@-$(RM) $@
+    $(COMMAND_ECHO)@noop $(assign PMERGELIST+:=$(<:f))
+    $(COMMAND_ECHO)@noop $(assign PDESTDIR:=$(@:d))
+.ENDIF          # "$(WITH_LANG)"==""
+
+$(MISC)/$(TARGET).pmerge.mk : $(PMERGELIST)
+.IF "$(WITH_LANG)"!=""
+# jpropex command file requirements:
+# - one file per line
+# - no spaces
+# - no empty lines
+# $(uniq ...) to workaround $assign adding the value twice...
+    @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
+    $(COMMAND_ECHO)$(SOLARBINDIR)/jpropex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l all -lf $(alllangiso:s/ /,/) -m $(LOCALIZESDF)
+.ENDIF          # "$(WITH_LANG)"!=""
+    @-$(RM) $@
+    $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
+
+.ENDIF          # "$(L10NPROPERTYFILES)"!=""
+
+
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 2b013bd52..45fa08734 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -151,7 +151,7 @@ LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
 LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../../../../basis-link/program'\'
+LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
 .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index 5ddbe058b..b1778a0ed 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -137,7 +137,7 @@ LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
 LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../../../../basis-link/program'\'
+LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
 LINKCFLAGS=-w -mt -z combreloc -norunpath
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 92720da3d..4febb67d4 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -143,7 +143,7 @@ LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
 LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../../../../basis-link/program'\'
+LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
 LINKCFLAGS=-w -mt -z combreloc -norunpath
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 45dadc53f..c73d6fc37 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -137,7 +137,7 @@ LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
 LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
 LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../../../../basis-link/program'\'
+LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=stlport4
 LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index abb2bb25e..a6c7e67cf 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -110,7 +110,7 @@ LINK*=$(CXX)
 LINKC*=$(CC)
 
 CYGLIB=$(LIB:s/;/ -L/)
-LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc -L$(CYGLIB)
+LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc-v2 -L$(CYGLIB)
 .IF "$(USE_MINGW)"=="cygwin"
 MINGWLIBDIR=$(COMPATH)$/lib$/mingw
 .ELSE
diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c
index 38b8c7a4c..edef14bdc 100644
--- a/soltools/cpp/_nlist.c
+++ b/soltools/cpp/_nlist.c
@@ -3,9 +3,6 @@
 #include <string.h>
 #include "cpp.h"
 
-extern int stgetopt(int, char *const *, const char *);
-extern char *optarg;
-extern int optind;
 extern int Cplusplus;
 Nlist *kwdefined;
 char wd[128];
diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c
index 627a29fc7..ce4ca4059 100644
--- a/soltools/cpp/_unix.c
+++ b/soltools/cpp/_unix.c
@@ -12,9 +12,15 @@
 
 #include "cpp.h"
 
+#if defined MACOSX || !defined HAVE_GETOPT
 extern int stgetopt(int, char *const *, const char *);
-extern char *optarg, rcsid[];
+extern char *optarg;
 extern int optind;
+#else
+#include <getopt.h>
+#endif
+
+extern char rcsid[];
 
 int Pflag = 0;                          /* print no line information */
 int Iflag = 0;							/* print includes */
@@ -36,7 +42,11 @@ void
     Tokenrow tr;
 
     setup_kwtab();
+#if defined MACOSX || !defined HAVE_GETOPT
     while ((c = stgetopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
+#else
+    while ((c = getopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
+#endif
         switch (c)
         {
             case 'N':
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index 818c27028..533cf9a91 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -45,7 +45,6 @@ LIBSALCPPRT=$(0)
 OBJFILES= \
     $(OBJ)$/_cpp.obj		\
     $(OBJ)$/_eval.obj 	\
-    $(OBJ)$/_getopt.obj	\
     $(OBJ)$/_include.obj \
     $(OBJ)$/_lex.obj 	\
     $(OBJ)$/_macro.obj 	\
@@ -54,6 +53,15 @@ OBJFILES= \
     $(OBJ)$/_tokens.obj 	\
     $(OBJ)$/_unix.obj
 
+# nonstandard cpp options needed for Mac (-isysroot),
+# needs the custom stgetopt defined here :/
+.IF "$(OS)" == "MACOSX" || "$(HAVE_GETOPT)" != "YES"
+OBJFILES += $(OBJ)$/_getopt.obj
+.ENDIF
+.IF "$(HAVE_GETOPT)" == "YES"
+CDEFS += -DHAVE_GETOPT
+.ENDIF
+
 APP1TARGET	=	$(TARGET)
 .IF "$(GUI)" != "OS2"
 APP1STACK	=	1000000
diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c
index 6e61a331b..d6dc580dd 100644
--- a/soltools/javadep/javadep.c
+++ b/soltools/javadep/javadep.c
@@ -138,12 +138,14 @@ void    usage(void);
 void    err_quit(const char *, ...);
 void    silent_quit(void);
 
+#ifdef WNT
 /* poor man's getopt() */
 int     simple_getopt(char *pargv[], const char *poptstring);
 char    *optarg = NULL;
 int     optind  = 1;
 int     optopt  = 0;
 int     opterr  = 0;
+#endif
 
 uint8
 read_uint8(const file_t *pfile)
@@ -748,7 +750,7 @@ int simple_getopt(char *pargv[], const char *poptstring)
             char *popt;
             int c = parg[1];
             if ( (popt = strchr(poptstring, c)) == NULL ) {
-                optopt = c;
+               optopt = c;
                 if ( opterr )
                     fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
                 return '?';
@@ -769,7 +771,6 @@ int simple_getopt(char *pargv[], const char *poptstring)
     return -1;
 }
 
-
 int CDECL
 main(int argc, char *argv[])
 {
@@ -817,7 +818,11 @@ main(int argc, char *argv[])
     opterr = 0;
     pincs = allocate_growable();
 
+#ifdef WNT
     while( (c = simple_getopt(pall_argv, ":i:I:s:S:o:OhHvV")) != -1 ) {
+#else
+    while( (c = getopt(nall_argc, pall_argv, ":i:I:s:S:o:OhHvV")) != -1 ) {
+#endif
         switch(c) {
             case 'i':
             case 'I':
diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst
index 000db8095..a3e859503 100644
--- a/splitbuild/extern.lst
+++ b/splitbuild/extern.lst
@@ -1 +1 @@
-afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib 
+afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz mythes neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib