--- rancid-2.3.2a6.orig/bin/nslogin.in	2006-12-05 17:50:53.000000000 +0100
+++ rancid-2.3.2a6/bin/nslogin.in	2008-10-30 02:44:21.000000000 +0100
@@ -398,7 +398,7 @@ proc login { router user userpswd passwd
 				  send_user "\nError: Check your passwd for $router\n"
 				  return 1
 				}
-	-re "@\[^\r\n]+ $p_prompt"	{
+	-re "$p_prompt"		{
 					  # ssh pwd prompt
 					  sleep 1
 					  send "$userpswd\r"
@@ -524,7 +524,7 @@ foreach router [lrange $argv $i end] {
     send_user "$router\n"
 
     # Figure out prompt.
-    set prompt "#"
+    set prompt ">"
 
     # look for noenable option in .cloginrc
     if { [find noenable $router] != "" } {
@@ -621,6 +621,7 @@ foreach router [lrange $argv $i end] {
     send "\r"
     expect {
 	-re "\[\r\n]+"		{ exp_continue; }
+	-re "$prompt"		{ }
 	-re "^(.+:)1 $prompt"	{ # stoopid extreme cmd-line numbers and
 				  # prompt based on state of config changes
 				  set junk $expect_out(1,string)