--- configure.in.old	2011-07-07 19:22:48.000000000 +0200
+++ configure.in	2011-07-08 17:09:18.000000000 +0200
@@ -167,6 +167,11 @@ AC_ARG_ENABLE(activex_component,
         [Remove support for ActiveX embedding of LibO.]),
 ,enable_activex_component=yes)
 
+AC_ARG_ENABLE(helpcontent,
+    AS_HELP_STRING([--disable-helpcontent],
+        [Do not build helpcontent. The wiki help is enough.]),
+,)
+
 AC_ARG_ENABLE(odk,
     AS_HELP_STRING([--disable-odk],
         [LibO includes an ODK, office development kit which some packagers may
@@ -3837,6 +3842,18 @@ fi
 AC_SUBST(BUILD_STAX)
 
 dnl ===================================================================
+dnl Check for building helpcontent
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build helpcontent])
+if test "$enable_helpcontent" != "no" ; then
+   BUILD_TYPE="$BUILD_TYPE HELPCONTENT2"
+   SCPDEFS="$SCPDEFS -DWITH_HELPCONTENT2"
+   AC_MSG_RESULT([yes])
+else    
+   AC_MSG_RESULT([no, wikihelp is enough])
+fi
+
+dnl ===================================================================
 dnl Check for building ODK
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build the ODK])
--- scp2/source/draw/file_draw.scp.old	2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/draw/file_draw.scp	2011-07-08 16:59:32.000000000 +0200
@@ -34,6 +34,8 @@ File gid_File_Share_Registry_Draw_Xcd
     Name = "draw.xcd";
 End
 
+#ifdef WITH_HELPCONTENT2
+
 File gid_File_Help_Sdraw_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -41,6 +43,8 @@ File gid_File_Help_Sdraw_Zip
     Patchfiles = (); 
 End
 
+#endif
+
 File gid_File_Exe_Sdraw
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
--- scp2/source/base/file_base.scp.old	2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/base/file_base.scp	2011-07-08 17:00:37.000000000 +0200
@@ -72,6 +72,8 @@ STD_RES_FILE( gid_File_Res_Rptui, rptui)
 
 STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
 
+#ifdef WITH_HELPCONTENT2
+
 File gid_File_Help_Sdatabase_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -79,6 +81,8 @@ File gid_File_Help_Sdatabase_Zip
     Patchfiles = (); 
 End
 
+#endif
+
 File gid_File_Share_Registry_Base_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
--- scp2/source/writer/file_writer.scp.old	2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/writer/file_writer.scp	2011-07-08 16:59:11.000000000 +0200
@@ -53,6 +53,8 @@ File gid_File_Exe_Sweb
 End
 #endif
 
+#ifdef WITH_HELPCONTENT2
+
 File gid_File_Help_Swriter_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -60,6 +62,8 @@ File gid_File_Help_Swriter_Zip
     Patchfiles = ();
 End
 
+#endif
+
 /*
 File gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml
     TXT_FILE_BODY;
--- scp2/source/calc/file_calc.scp.old	2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/calc/file_calc.scp	2011-07-08 16:58:38.000000000 +0200
@@ -65,6 +65,8 @@ STD_RES_FILE( gid_File_Res_Date, date)
 
 STD_RES_FILE( gid_File_Res_Sc, sc )
 
+#ifdef WITH_HELPCONTENT2
+
 File gid_File_Help_Scalc_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -72,6 +74,8 @@ File gid_File_Help_Scalc_Zip
     Patchfiles = ();
 End
 
+#endif
+
 // new user interface configuration files
 /*
 File gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml
--- scp2/source/impress/file_impress.scp.old	2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/impress/file_impress.scp	2011-07-08 16:58:11.000000000 +0200
@@ -44,6 +44,8 @@ File gid_File_Share_Registry_Impress_Xcd
     Name = "impress.xcd";
 End
 
+#ifdef WITH_HELPCONTENT2
+
 File gid_File_Help_Simpress_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -51,6 +53,8 @@ File gid_File_Help_Simpress_Zip
     Patchfiles = (); 
 End
 
+#endif
+
 File gid_File_Exe_Simpress
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
--- scp2/source/math/file_math.scp.old	2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/math/file_math.scp	2011-07-08 16:57:51.000000000 +0200
@@ -50,6 +50,8 @@ File gid_File_Share_Registry_Math_Xcd
     Name = "math.xcd";
 End
 
+#ifdef WITH_HELPCONTENT2
+
 File gid_File_Help_Smath_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -57,6 +59,8 @@ File gid_File_Help_Smath_Zip
     Patchfiles = ();
 End
 
+#endif
+
 File gid_File_Exe_Smath
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
--- scp2/source/ooo/directory_ooo.scp.old	2011-06-13 10:46:50.000000000 +0200
+++ scp2/source/ooo/directory_ooo.scp	2011-07-08 13:26:42.000000000 +0200
@@ -1215,6 +1215,8 @@ Directory gid_Dir_Basis_Sdk
     DosName = "sdk";
 End
 
+#ifdef WITH_HELPCONTENT2
+
 Directory gid_Dir_Help
 #if defined MACOSX
     ParentID = gid_Brand_Dir_BasisLink;
@@ -1234,6 +1236,8 @@ Directory gid_Dir_Help_Isolanguage
 #endif
 End
 
+#endif
+
 #ifdef UNX
 
 Directory gid_Dir_User_Psprint
--- scp2/source/ooo/file_ooo.scp.old	2011-05-20 18:04:45.000000000 +0200
+++ scp2/source/ooo/file_ooo.scp	2011-07-08 16:12:23.000000000 +0200
@@ -362,6 +362,8 @@ STD_FILTER_FILE( gid_File_Filter_Iti, it
 
 STD_RES_FILE( gid_File_Res_Eps, eps )
 
+#ifdef WITH_HELPCONTENT2
+
 File gid_File_Help_Common_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -388,6 +390,8 @@ File gid_File_Help_Schart_Zip
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
 End
 
+#endif
+
 #if defined WNT
 
 File gid_File_Jar_Accessbridge
--- scp2/source/ooo/common_brand.scp.old	2011-05-20 18:04:45.000000000 +0200
+++ scp2/source/ooo/common_brand.scp	2011-07-08 16:13:36.000000000 +0200
@@ -167,6 +167,8 @@ Directory gid_Brand_Dir_Readme
     DosName = "readmes";
 End
 
+#ifdef WITH_HELPCONTENT2
+
 Directory gid_Brand_Dir_Help
 #if defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;
@@ -181,6 +183,8 @@ Directory gid_Brand_Dir_Help_Isolanguage
     DIR_ISOLANGUAGE_ALL_LANG;
 End
 
+#endif
+
 Directory gid_Brand_Dir_Share
 #if defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;
--- scp2/source/ooo/module_helppack.scp.old	2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/ooo/module_helppack.scp	2011-07-08 16:15:09.000000000 +0200
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_HELPCONTENT2
+
 Module gid_Module_Helppack_Helproot
     ParentID = gid_Module_Root;
     XPDParentID = "root";
@@ -40,3 +42,5 @@ Module gid_Module_Helppack_Helproot
 End
 
 #include "allhelpmodules.inc"
+
+#endif
--- scp2/source/ooo/module_help_template.scp.old	2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/ooo/module_help_template.scp	2011-07-08 16:16:14.000000000 +0200
@@ -25,6 +25,8 @@
  *
  ************************************************************************/
 
+#ifdef WITH_HELPCONTENT2
+
 Module gid_Module_Helppack_Help_Template
     ParentID = gid_Module_Helppack_Helproot;
     Name = "gid_Module_Helppack_Help_Template";
@@ -44,3 +46,5 @@ Module gid_Module_Helppack_Help_Template
 End
 
 #include "allhelpmodules_root.inc"
+
+#endif
--- scp2/source/templates/module_helppack_root.sct.old	2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/templates/module_helppack_root.sct	2011-07-08 16:19:16.000000000 +0200
@@ -25,6 +25,8 @@
  *
 ************************************************************************/
 
+#ifdef WITH_HELPCONTENT2
+
 Module gid_Module_Helppack_Help_<LANGUAGE_>
     ParentID = gid_Module_Helppack_Root_<LANGUAGE_>;
     Sortkey = "200";
@@ -35,3 +37,5 @@ Module gid_Module_Helppack_Help_<LANGUAG
     PackageInfo = "packinfo_office_help.txt";
     Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
 End
+
+#endif