diff --git a/themes/modern/communicator/.cvsignore b/themes/modern/communicator/.cvsignore
new file mode 100644
index 000000000000..f3c7a7c5da68
--- /dev/null
+++ b/themes/modern/communicator/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/themes/modern/communicator/Makefile.in b/themes/modern/communicator/Makefile.in
new file mode 100644
index 000000000000..738c3dfea91b
--- /dev/null
+++ b/themes/modern/communicator/Makefile.in
@@ -0,0 +1,48 @@
+#
+# 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): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+THEME       = modern
+
+include $(DEPTH)/config/autoconf.mk
+
+EXPORT_RESOURCE = \
+		$(srcdir)/brand.css \
+		$(srcdir)/box.css \
+		$(srcdir)/button.css \
+		$(srcdir)/communicator.css \
+		$(srcdir)/menu.css \
+		$(srcdir)/menubutton.css \
+		$(srcdir)/splitter.css \
+		$(srcdir)/toolbar.css \
+		$(srcdir)/navbar-endbox.gif \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+DIRS            = search xpinstall pref sidebar bookmarks directory profile regviewer related wallet 
+
+install::
+	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/chrome/$(THEME)/communicator/skin
+
diff --git a/themes/modern/communicator/directory/Makefile.in b/themes/modern/communicator/directory/Makefile.in
index b58f8da3f282..e631a387d0b1 100644
--- a/themes/modern/communicator/directory/Makefile.in
+++ b/themes/modern/communicator/directory/Makefile.in
@@ -27,7 +27,7 @@ THEME       = modern
 
 include $(DEPTH)/config/autoconf.mk
 
-SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/directory/bookmarks
+SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/directory
 
 EXPORT_RESOURCE_SAMPLES = \
         directory.css \
diff --git a/themes/modern/communicator/pref/.cvsignore b/themes/modern/communicator/pref/.cvsignore
new file mode 100644
index 000000000000..f3c7a7c5da68
--- /dev/null
+++ b/themes/modern/communicator/pref/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/themes/modern/communicator/pref/Makefile.in b/themes/modern/communicator/pref/Makefile.in
new file mode 100644
index 000000000000..defeae12bc0d
--- /dev/null
+++ b/themes/modern/communicator/pref/Makefile.in
@@ -0,0 +1,42 @@
+#
+# 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) 2000 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+THEME       = modern
+
+include $(DEPTH)/config/autoconf.mk
+
+SAMPLES_DIR	= $(DIST)/bin/chrome/$(THEME)/communicator/skin/pref
+
+EXPORT_RESOURCE_SAMPLES = \
+        pref.css \
+        $(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES))
+
+install::
+	$(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR)
+