diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 025d1a557de..c4fb619c554 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -80,6 +80,7 @@ DIRS +=				\
   silentdl			\
   xpinstall			\
   sun-java			\
+  extensions                    \
   $(NULL)
 
 ifdef MOZ_BUILD_XPFE
diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh
index a29d0d5c119..66649500ef9 100755
--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -78,6 +78,11 @@ editor/public/Makefile
 expat/Makefile
 expat/xmlparse/Makefile
 expat/xmltok/Makefile
+extensions/Makefile
+extensions/wallet/Makefile
+extensions/wallet/public/Makefile
+extensions/wallet/src/Makefile
+extensions/wallet/module/Makefile
 gfx/Makefile
 gfx/public/Makefile
 gfx/src/Makefile
diff --git a/mozilla/extensions/Makefile.in b/mozilla/extensions/Makefile.in
new file mode 100644
index 00000000000..b3c4bde73c8
--- /dev/null
+++ b/mozilla/extensions/Makefile.in
@@ -0,0 +1,28 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+
+DIRS=wallet
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/extensions/wallet/Makefile.in b/mozilla/extensions/wallet/Makefile.in
new file mode 100644
index 00000000000..ae597fa912d
--- /dev/null
+++ b/mozilla/extensions/wallet/Makefile.in
@@ -0,0 +1,28 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+
+DIRS=public src module
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/extensions/wallet/module/Makefile.in b/mozilla/extensions/wallet/module/Makefile.in
new file mode 100644
index 00000000000..f0f732ba1f9
--- /dev/null
+++ b/mozilla/extensions/wallet/module/Makefile.in
@@ -0,0 +1,40 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+MODULE	= walletlib
+DLLNAME=walletlib
+LIBRARY_NAME=walle
+
+DEPTH= ../../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
+
+EXPORTS = nsIWalletService.h		\
+	  $(NULL)
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+CPPSRCS = \
+	nsWalletFactory.cpp \
+	nsWalletService.cpp \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/extensions/wallet/public/Makefile.in b/mozilla/extensions/wallet/public/Makefile.in
new file mode 100644
index 00000000000..b1912b3bcf1
--- /dev/null
+++ b/mozilla/extensions/wallet/public/Makefile.in
@@ -0,0 +1,34 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+EXPORTS =			\
+	singsign.h		\
+	wallet.h		\
+        $(NULL)			
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+MODULE = wallet
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
\ No newline at end of file
diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in
new file mode 100644
index 00000000000..0a2db5c12fa
--- /dev/null
+++ b/mozilla/extensions/wallet/src/Makefile.in
@@ -0,0 +1,49 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME=wallet
+
+
+CPPSRCS =				\
+	wallet.cpp	\
+	$(NULL)
+
+MODULE=wallet
+REQUIRES=wallet
+
+EXPORTS= $(NULL)
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+INCLUDES += \
+    -I$(PUBLIC)\raptor	 \
+    -I$(PUBLIC)\xpcom	 \
+    -I$(PUBLIC)\dom	 \
+    -I$(PUBLIC)\js	 \
+    -I$(PUBLIC)\netlib	 \
+    -I$(PUBLIC)\security \
+    -I$(PUBLIC)\pref	 \
+    -I$(PUBLIC)\wallet
+
+include $(topsrcdir)/config/rules.mk