6 files changed, 62 insertions, 2 deletions
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index a6d6db425a22..1835a39819b5 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -29,6 +29,7 @@
  ************************************************************************/
 #include "macros.inc"
 
+#ifdef ENABLE_KDE
 File gid_File_Lib_Kdebe
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -37,4 +38,15 @@ File gid_File_Lib_Kdebe
     RegistryID = gid_Starregistry_Services_Rdb;
     Regmergefile = "kdebe1-ucd.txt";
 End
+#endif
 
+#ifdef ENABLE_KDE4
+File gid_File_Lib_Kde4be
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Regmergefile = "kde4be1-ucd.txt";
+End
+#endif
diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk
index 0cbf6a47123d..6ddb30108ce6 100644
--- a/scp2/source/kde/makefile.mk
+++ b/scp2/source/kde/makefile.mk
@@ -43,7 +43,16 @@ TARGETTYPE=CUI
 
 SCP_PRODUCT_TYPE=osl
 
-.IF "$(ENABLE_KDE)" == "TRUE"
+.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
+
+.IF "$(ENABLE_KDE)" != ""
+SCPDEFS+=-DENABLE_KDE
+.ENDIF
+
+.IF "$(ENABLE_KDE4)" != ""
+SCPDEFS+=-DENABLE_KDE4
+.ENDIF
+
 PARFILES =                   \
         module_kde.par     \
         file_kde.par
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 1dce456f6726..28dacbef0583 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -30,12 +30,24 @@
 
 #include "macros.inc"
 
+#if defined( ENABLE_KDE ) || defined( ENABLE_KDE4 )
 Module gid_Module_Optional_Kde
     ParentID = gid_Module_Optional;
     Default = YES;
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
     Styles = (DONTSHOWINUSERINSTALL);
-    Files = (gid_File_Lib_Kdebe);
+    Files = (
+#ifdef ENABLE_KDE
+    gid_File_Lib_Kdebe
+#ifdef ENABLE_KDE4
+    ,
+#endif // ENABLE_KDE4
+#endif // ENABLE_KDE
+#ifdef ENABLE_KDE4
+    gid_File_Lib_Kde4be
+#endif // ENABLE_KDE4
+    );
 End
+#endif
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 98d407c53373..24e8342cc0d5 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -590,6 +590,18 @@ File gid_File_Lib_Fps_Gnome
 End
 #endif
 #endif
+#ifdef ENABLE_KDE4
+#ifndef MACOSX
+File gid_File_Lib_Fps_Kde4
+    TXT_FILE_BODY;
+    Styles = (PACKED,UNO_COMPONENT);
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Dir = gid_Dir_Program;
+    Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
+    Regmergefile = "fps-kde4-ucd.txt";
+End
+#endif
+#endif
 #endif
 
 #ifdef MACOSX
@@ -1202,6 +1214,16 @@ File gid_File_Lib_Vclplug_Kde
 End
 #endif
 #endif
+#ifdef ENABLE_KDE4
+#ifndef MACOSX
+File gid_File_Lib_Vclplug_Kde4
+    Name = LIBNAME(vclplug_kde4);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+End
+#endif
+#endif
 #endif
 
 #if defined(QUARTZ)
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index adb0175252c1..646196ec336a 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -79,6 +79,10 @@ SCPDEFS+=-DENABLE_SYSTRAY_GTK
 SCPDEFS+=-DENABLE_KDE
 .ENDIF
 
+.IF "$(ENABLE_KDE4)" != ""
+SCPDEFS+=-DENABLE_KDE4
+.ENDIF
+
 .IF "$(ENABLE_KAB)" != ""
 SCPDEFS+=-DENABLE_KAB
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index c08852aae29a..8729bea719f3 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -242,6 +242,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Vclplug_Gen,
 	gid_File_Lib_Vclplug_Gtk,
 	gid_File_Lib_Vclplug_Kde,
+	gid_File_Lib_Vclplug_Kde4,
 	gid_File_Lib_Vclplug_Svp,
 	gid_File_Lib_Basctl,
 	gid_File_Lib_CanvasTools,