diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 1c41e7e075f6..ca40ac7264d2 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -105,7 +105,7 @@
 #endif
 
 ; [Components]
-@BINPATH@/components/components.list
+@BINPATH@/components/components.manifest
 @BINPATH@/components/alerts.xpt
 #ifdef ACCESSIBILITY
 #ifdef XP_WIN32
diff --git a/config/rules.mk b/config/rules.mk
index 444a5e47a782..6704c75009e5 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -883,7 +883,7 @@ ifdef SHARED_LIBRARY
 ifdef IS_COMPONENT
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
 	$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
-	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.list $(SHARED_LIBRARY)
+	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)"
 ifdef BEOS_ADDON_WORKAROUND
 	( cd $(FINAL_TARGET)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
 endif
diff --git a/xpcom/sample/Makefile.in b/xpcom/sample/Makefile.in
index 01985467a03c..10f369b90412 100644
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@@ -83,7 +83,7 @@ include $(topsrcdir)/config/config.mk
 
 # EXTRA_COMPONENTS installs components written JavaScript to
 # dist/bin/components
-EXTRA_COMPONENTS = nsSample.js
+EXTRA_COMPONENTS = nsSample.js nsSample.manifest
 
 # EXTRA_DSO_LDOPTS specifies linker flags when building a shared library
 # from this Makefile. We link against the "dependent glue" and against the
@@ -108,9 +108,3 @@ libs:: $(TARGETS)
 
 install:: $(TARGETS)
 	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/xpconnect-sample.html $(DESTDIR)$(mozappdir)/res/samples
-
-# XXX TEMPORARY DEMONSTRATION HACK
-libs::
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(srcdir)/nsSample.manifest > $(DIST)/bin/components/nsSample.manifest
-
-DEFINES += -DSHARED_LIBRARY=$(SHARED_LIBRARY)
diff --git a/xpcom/sample/nsSample.manifest b/xpcom/sample/nsSample.manifest
index ec39b2be41b1..f0a9aaaa0bab 100644
--- a/xpcom/sample/nsSample.manifest
+++ b/xpcom/sample/nsSample.manifest
@@ -1,3 +1,2 @@
 component dea98e50-1dd1-11b2-9344-8902b4805a2e nsSample.js
 contract @mozilla.org/jssample;1 dea98e50-1dd1-11b2-9344-8902b4805a2e
-binary-component @SHARED_LIBRARY@