diff -u -u -r1.181 rhythmdb.c
--- rhythmdb/rhythmdb.c	1 Mar 2006 12:19:09 -0000	1.181
+++ rhythmdb/rhythmdb.c	5 Mar 2006 10:22:23 -0000
@@ -820,7 +820,7 @@
 	for (tem = db->priv->added_entries; tem; tem = tem->next) {
 		RhythmDBEntry *entry = tem->data;
 
-		if (entry->type == RHYTHMDB_ENTRY_TYPE_SONG) {
+		if (entry->type == RHYTHMDB_ENTRY_TYPE_SONG && !db->priv->no_update) {
 			const gchar *uri;
 
 			uri = rhythmdb_entry_get_string (entry, 
diff -u -u -r1.87 main.c
--- shell/main.c	4 Mar 2006 22:37:39 -0000	1.87
+++ shell/main.c	5 Mar 2006 10:22:23 -0000
@@ -172,7 +172,7 @@
 
 		{ "debug",			'd',POPT_ARG_NONE,	&debug,				0, N_("Enable debug output"), NULL },
 		{ "debug-match",		'D',POPT_ARG_STRING,	&debug_match,			0, N_("Enable debug output matching a specified string"), NULL },
-		{ "no-update",			0,  POPT_ARG_NONE,	&no_update,			0, N_("Do not update the library"), NULL },
+		{ "no-update",			0,  POPT_ARG_NONE,	&no_update,			0, N_("Do not update the library with file changes"), NULL },
 		{ "no-registration",		'n',POPT_ARG_NONE,	&no_registration,		0, N_("Do not register the shell"), NULL },
 		{ "dry-run",			0,  POPT_ARG_NONE,	&dry_run,			0, N_("Don't save any data permanently (implies --no-registration)"), NULL },
 		{ "rhythmdb-file",		0,  POPT_ARG_STRING,	&rhythmdb_file,			0, N_("Path for database file to use"), NULL },
 }
