diff --git a/mozilla/mailnews/extensions/palmsync/Makefile.in b/mozilla/mailnews/extensions/palmsync/Makefile.in
index b1d310402f2..40854f02b0d 100644
--- a/mozilla/mailnews/extensions/palmsync/Makefile.in
+++ b/mozilla/mailnews/extensions/palmsync/Makefile.in
@@ -28,5 +28,14 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= build public src
 
+ifdef PALM_CDK_DIR
+DIRS		+= conduit
+else
+libs::
+	@echo " "
+	@echo "PLEASE SET 'PALM_CDK_DIR' ENV VARIABLE to THE DIR WHERE YOU HAVE PALM CDK INSTALLED IF YOU WANT TO BUILD THE CONDUIT"
+	@echo " "
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/extensions/palmsync/conduit/Makefile.in b/mozilla/mailnews/extensions/palmsync/conduit/Makefile.in
new file mode 100644
index 00000000000..a96688305e2
--- /dev/null
+++ b/mozilla/mailnews/extensions/palmsync/conduit/Makefile.in
@@ -0,0 +1,65 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2002 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+PALM_CDK_INC	= $(PALM_CDK_DIR)/C++/Include
+PALM_CDK_LIB	= $(PALM_CDK_DIR)/C++/Lib
+PALM_PFC_INC	= $(PALM_CDK_DIR)/C++/Pfc/include
+PALM_PFC_SRC	= $(PALM_CDK_DIR)/C++/Pfc/Src
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= mozABConduit
+EXPORT_LIBRARY	= $(MODULE)
+LIBRARY_NAME	= $(MODULE)
+
+REQUIRES	= PalmSyncProxy \
+		  $(NULL)
+
+CPPSRCS		= MozABConduitGenCond.cpp \
+		  MozABConduitRecord.cpp \
+		  MozABConduitSync.cpp \
+		  MozABHHManager.cpp \
+		  MozABPCManager.cpp \
+		  $(NULL)
+
+LOCAL_INCLUDES += -I$(PALM_CDK_INC) \
+		  -I$(PALM_PFC_INC) \
+		  -I$(PALM_PFC_SRC) \
+		   $(NULL)
+
+EXTRA_DSO_LDOPTS = \
+		   $(PALM_CDK_LIB)/sync20.$(LIB_SUFFIX) \
+		   $(PALM_CDK_LIB)/palmcmn.$(LIB_SUFFIX) \
+		   $(NULL)
+
+OS_LIBS		+= ole32.lib
+
+# Force use of PIC
+FORCE_USE_PIC	= 1 
+FORCE_SHARED_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/mailnews/extensions/palmsync/conduit/MozABConduitGenCond.cpp b/mozilla/mailnews/extensions/palmsync/conduit/MozABConduitGenCond.cpp
index 4141b0b0216..c3fe0dc192d 100644
--- a/mozilla/mailnews/extensions/palmsync/conduit/MozABConduitGenCond.cpp
+++ b/mozilla/mailnews/extensions/palmsync/conduit/MozABConduitGenCond.cpp
@@ -10,6 +10,10 @@
 #define TRACE0(sz)
 #define TRACE(sz)
 
+#include <CPalmRec.cpp>
+#include <CPString.cpp>
+#include <CPCatgry.cpp>
+
 #include <windows.h>
 #include <string.h>
 #include <stdio.h>