--- a/shell/Library_tdebe.mk
+++ b/shell/Library_tdebe.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_Library_Library,tdebe1))
 
+$(eval $(call gb_Library_set_include,tdebe1,\
+        $$(INCLUDE) \
+    $$(TDE_CFLAGS) \
+))
+
 $(eval $(call gb_Library_use_packages,tdebe1,\
 	shell_inc \
 ))
@@ -40,6 +45,11 @@
 	tde \
 ))
 
+$(eval $(call gb_Library_add_libs,tdebe1,\
+    $$(TDE_LIBS) \
+        -lkio \
+))
+
 $(eval $(call gb_Library_use_libraries,tdebe1,\
 	cppu \
 	cppuhelper \
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -74,7 +74,7 @@
 ))
 endif
 
-ifeq ($(ENABLE_TAB),TRUE)
+ifeq ($(ENABLE_TDEAB),TRUE)
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_tdeab \
 	Library_tdeab1 \
--- a/Repository.mk
+++ b/Repository.mk
@@ -300,6 +300,8 @@
 	itg \
 	iti \
 	jdbc \
+	tdeab1 \
+	tdeabdrv1 \
 	kab1 \
 	kabdrv1 \
     lng \
@@ -534,6 +536,7 @@
     hatchwindowfactory \
     i18npool \
     i18nsearch \
+    tdebe1 \
     kdebe1 \
     kde4be1 \
     localebe1 \
--- a/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * 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.
- *
- ************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <node oor:name="Installed" install:module="tdeab">
-    <node oor:name="sdbc:address:tdeab" oor:op="replace">
-      <prop oor:name="Driver">
-        <value>com.sun.star.comp.sdbc.tdeab.Driver</value>
-      </prop>
-      <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
-        <value xml:lang="en-US">TDE Address Book</value>
-      </prop>
-      <node oor:name="Features">
-        <node oor:name="EscapeDateTime" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:boolean">
-            <value>true</value>
-          </prop>
-        </node>
-      </node>
-    </node>
-  </node>
-</oor:component-data>
--- /dev/null
+++ b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************ -->
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <node oor:name="Installed" install:module="tdeab">
+    <node oor:name="sdbc:address:tdeab" oor:op="replace">
+      <prop oor:name="Driver">
+        <value>com.sun.star.comp.sdbc.tdeab.Driver</value>
+      </prop>
+      <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
+        <value xml:lang="en-US">TDE Address Book</value>
+      </prop>
+      <node oor:name="Features">
+        <node oor:name="EscapeDateTime" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
+      </node>
+    </node>
+  </node>
+</oor:component-data>
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -33,11 +33,21 @@
 
 $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1))
 
+$(eval $(call gb_Library_set_include,tdeab1,\
+        -I$(SRCDIR)/connectivity/source/inc \
+        $$(INCLUDE) \
+    $$(TDE_CFLAGS) \
+))
+
 $(eval $(call gb_Library_use_api,tdeab1,\
 	offapi \
 	udkapi \
 ))
 
+$(eval $(call gb_Library_add_libs,tdeab1,\
+    $$(TDE_LIBS) \
+))
+
 $(eval $(call gb_Library_use_libraries,tdeab1,\
 	comphelper \
 	cppu \
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -27,12 +27,19 @@
 
 $(eval $(call gb_Library_Library,tdeabdrv1))
 
+$(eval $(call gb_Library_set_include,tdeabdrv1,\
+        -I$(SRCDIR)/connectivity/source/inc \
+        $$(INCLUDE) \
+    $$(TDE_CFLAGS) \
+))
+
 $(eval $(call gb_Library_use_api,tdeabdrv1,\
 	offapi \
 	udkapi \
 ))
 
 $(eval $(call gb_Library_add_libs,tdeabdrv1,\
+    $$(TDE_LIBS) \
 	-lkabc \
 ))
 
--- a/connectivity/Configuration_tdeab.mk
+++ b/connectivity/Configuration_tdeab.mk
@@ -14,6 +14,8 @@
 # Major Contributor(s):
 # Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
 #  (initial developer)
+# Copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
+#  (TDE version)
 #
 # All Rights Reserved.
 #
@@ -28,7 +30,7 @@
 $(eval $(call gb_Configuration_Configuration,driver_tdeab))
 
 $(eval $(call gb_Configuration_add_spool_modules,driver_tdeab,connectivity/registry/tdeab,\
-	org/openoffice/Office/DataAccess/Drivers-tab.xcu \
+	org/openoffice/Office/DataAccess/Drivers-tdeab.xcu \
 ))
 
 $(eval $(call gb_Configuration_add_localized_datas,driver_tdeab,connectivity/registry/tdeab,\
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -432,27 +432,16 @@
 
 #ifdef UNX
 
-#ifdef ENABLE_TDEAB
-File gid_File_Lib_Tdeab_1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libtdeab1,UNXSUFFIX));
-End
-
-File gid_File_Lib_Tdeab_Drv_1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libtdeabdrv1,UNXSUFFIX));
-End
-#endif
-
 #ifdef ENABLE_KAB
 STD_LIB_FILE(gid_File_Lib_Kab_1, kab1)
 STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1)
 #endif
 
+#ifdef ENABLE_TDEAB
+STD_LIB_FILE(gid_File_Lib_Tdeab_1, tdeab1)
+STD_LIB_FILE(gid_File_Lib_Tdeab_Drv_1, tdeabdrv1)
+#endif
+
 #ifdef MACOSX
 File gid_File_Lib_Macab_1
     LIB_FILE_BODY;
--- a/scp2/source/tde/file_tde.scp
+++ b/scp2/source/tde/file_tde.scp
@@ -25,7 +25,7 @@
 
 #ifdef ENABLE_TDE
 File gid_File_Lib_Tdebe
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(tdebe1.uno,UNXSUFFIX));
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -57,7 +57,9 @@
 {
 #ifdef UNX
     OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
-    if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
+    if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
+        return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFilePicker"));
+    else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
         return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFilePicker"));
     else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")))
         return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDE4FilePicker"));
@@ -138,7 +140,9 @@
 {
     OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
 #ifdef UNX
-    if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
+    if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
+        return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFolderPicker"));
+    else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
         return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker"));
     else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx")))
         return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker"));
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -46,6 +46,8 @@
 	ENABLE_NSPLUGIN \
 	ENABLE_ONLINE_UPDATE \
 	ENABLE_OPENGL \
+	ENABLE_TDE \
+	ENABLE_TDEAB \
 	ENABLE_XMLSEC \
 	MERGELIBS \
 	SYSTEM_BOOST \
--- a/scp2/InstallModule_tde.mk
+++ b/scp2/InstallModule_tde.mk
@@ -34,6 +34,7 @@
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/tde,\
 	ENABLE_TDE \
+	ENABLE_TDEAB \
 ))
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/tde,\