diff --git a/ChangeLog b/ChangeLog
index b33573e74..530548f8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-10  Robin * Slomkowski  <rslomkow@eazel.com>
+
+	* data/Makefile.am: added placeholder files
+	* data/nautilus-extras.placeholder: a mostly empty file so rpm will produce a package
+	* data/nautilus-suggested.placeholder: a mostly empty file so rpm will produce a package
+	* nautilus.spec.in: moved login-view to trilbite component, also added placeholder files
+
 2000-10-10  Andy Hertzfeld  <andy@eazel.com>
 
 	* src/nautilus-shell-ui.xml:
diff --git a/data/Makefile.am b/data/Makefile.am
index 3a05d20fc..d7648ddb7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,6 +5,8 @@ infodir = $(datadir)/nautilus
 info_DATA = \
 	browser.xml \
 	static_bookmarks.xml \
+	nautilus-extras.placeholder \
+	nautilus-suggested.placeholder \
 	$(NULL)
 
 EXTRA_DIST = $(info_DATA)
diff --git a/data/nautilus-extras.placeholder b/data/nautilus-extras.placeholder
new file mode 100644
index 000000000..1c5edd482
--- /dev/null
+++ b/data/nautilus-extras.placeholder
@@ -0,0 +1,2 @@
+This file is a placeholder for the
+nautilus extras meta-package
diff --git a/data/nautilus-suggested.placeholder b/data/nautilus-suggested.placeholder
new file mode 100644
index 000000000..9f88650e4
--- /dev/null
+++ b/data/nautilus-suggested.placeholder
@@ -0,0 +1,2 @@
+This file is a placeholder for the 
+nautilus suggested meta-package
diff --git a/nautilus.spec.in b/nautilus.spec.in
index 8c3d5ebf5..082cce841 100644
--- a/nautilus.spec.in
+++ b/nautilus.spec.in
@@ -149,7 +149,6 @@ fi
 %{prefix}/bin/nautilus-hardware-view
 %{prefix}/bin/nautilus-history-view
 %{prefix}/bin/nautilus-image-view
-%{prefix}/bin/nautilus-login-view
 %{prefix}/bin/nautilus-music-view
 %{prefix}/bin/nautilus-notes
 %{prefix}/bin/nautilus-sample-content-view
@@ -215,7 +214,6 @@ fi
 %{prefix}/share/oaf/nautilus-hardware-view.oafinfo
 %{prefix}/share/oaf/nautilus-history-view.oafinfo
 %{prefix}/share/oaf/nautilus-image-view.oafinfo
-%{prefix}/share/oaf/nautilus-login-view.oafinfo
 %{prefix}/share/oaf/nautilus-music-view.oafinfo
 %{prefix}/share/oaf/nautilus-notes.oafinfo
 %{prefix}/share/oaf/nautilus-sample-content-view.oafinfo
@@ -250,6 +248,7 @@ fi
 %{prefix}/bin/trilobite-eazel-install-service
 %{prefix}/bin/trilobite-eazel-time-service
 %{prefix}/bin/trilobite-eazel-time-view
+%{prefix}/bin/nautilus-login-view
 %{prefix}/bin/nautilus-summary-view
 %{prefix}/bin/nautilus-rpm-view
 %{prefix}/bin/eazel-time
@@ -272,5 +271,16 @@ fi
 %{prefix}/share/oaf/trilobite-eazel-install-service.oafinfo
 %{prefix}/share/oaf/trilobite-eazel-time-service.oafinfo
 %{prefix}/share/oaf/trilobite-eazel-time-view.oafinfo
+%{prefix}/share/oaf/nautilus-login-view.oafinfo
 %{prefix}/share/oaf/nautilus-summary-view.oafinfo
 %{prefix}/share/oaf/nautilus-rpm-view.oafinfo
+
+%files extras
+
+%defattr(0444, bin, bin)
+%{prefix}/share/nautilus/nautilus-extras.placeholder
+
+%files suggested
+
+%defattr(0444, bin, bin)
+%{prefix}/share/nautilus/nautilus-suggested.placeholder