diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
index f963614d2b0..099aa0d4c3b 100644
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -56,7 +56,7 @@ DEFAULT_GMAKE_FLAGS += SOURCE_BIN_DIR=$(CORECONF_DIST)/bin
 DEFAULT_GMAKE_FLAGS += SOURCE_XP_DIR=$(CORECONF_DIST)
 
 
-DIRS		= ssl
+DIRS		= ssl pki
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/security/manager/pki/Makefile.in b/security/manager/pki/Makefile.in
new file mode 100644
index 00000000000..931da5efe6b
--- /dev/null
+++ b/security/manager/pki/Makefile.in
@@ -0,0 +1,30 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#  Terry Hayes <thayes@netscape.com>
+# 
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+DIRS		= resources src
+
+include $(topsrcdir)/config/rules.mk
diff --git a/security/manager/pki/resources/Makefile.in b/security/manager/pki/resources/Makefile.in
new file mode 100644
index 00000000000..53c2440ad63
--- /dev/null
+++ b/security/manager/pki/resources/Makefile.in
@@ -0,0 +1,33 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#  Terry Hayes <thayes@netscape.com>
+# 
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+chrome::
+	$(REGCHROME) content pippki pippki.jar
+	$(REGCHROME) locale en-US/pippki pippki.jar
diff --git a/security/manager/pki/src/Makefile.in b/security/manager/pki/src/Makefile.in
new file mode 100644
index 00000000000..a85e492e358
--- /dev/null
+++ b/security/manager/pki/src/Makefile.in
@@ -0,0 +1,74 @@
+#! gmake
+# 
+# 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 the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#     Javier Delgadillo <javi@netscape.com>
+#     Terry Hayes     <thayes@netscape.com>
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+# 
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= pippki
+LIBRARY_NAME	= pippki
+IS_COMPONENT	= 1
+
+EXPORTS = 			\
+	$(NULL)
+
+CPPSRCS = 				\
+	nsNSSDialogs.cpp	\
+    nsPKIModule.cpp     \
+	$(NULL)
+
+REQUIRES = nspr security js
+
+include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+=	\
+		-I$(DIST)/public/security \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_COMPONENT_LIBS) \
+        $(MOZ_JS_LIBS) \
+		$(NULL)
+
+EXTRA_LIBS	+= \
+        $(NULL)
+
+OUR_CC = $(shell which $(CCC))
+libs::
+	echo We used c++ at $(OUR_CC)