diff --git a/usr.sbin/IPXrouted/af.c b/usr.sbin/IPXrouted/af.c
index 28c231c67d8e..e7d6d9b30abf 100644
--- a/usr.sbin/IPXrouted/af.c
+++ b/usr.sbin/IPXrouted/af.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: af.c,v 1.4 1995/10/11 18:57:05 jhay Exp $
+ * $Id: af.c,v 1.1 1995/10/26 21:28:13 julian Exp $
  */
 
 #ifndef lint
@@ -194,10 +194,12 @@ struct sockaddr_ipx *sipx;
 {
 	register u_short *s = sipx->sipx_addr.x_host.s_host;
 
+	if ((s[0]==0x0000) && (s[1]==0x0000) && (s[2]==0x0000))
+		return (0);
 	if ((s[0]==0xffff) && (s[1]==0xffff) && (s[2]==0xffff))
 		return (0);
-	else
-		return (1);
+
+	return (1);
 }
 
 void
diff --git a/usr.sbin/IPXrouted/input.c b/usr.sbin/IPXrouted/input.c
index 0c653bb4cfd9..02dcfe9c2ff4 100644
--- a/usr.sbin/IPXrouted/input.c
+++ b/usr.sbin/IPXrouted/input.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: input.c,v 1.1 1995/10/26 21:28:16 julian Exp $
+ *	$Id: input.c,v 1.2 1995/11/13 21:01:30 julian Exp $
  */
 
 #ifndef lint
@@ -250,6 +250,7 @@ rip_input(from, size)
 						trt->rt_timer = 0;
 						break;
 					}
+					trt = trt->rt_clone;
 				}
 				if (trt == NULL) {
 					rtadd_clone(rt, sa, from, 
diff --git a/usr.sbin/IPXrouted/sap_input.c b/usr.sbin/IPXrouted/sap_input.c
index 44b6290f4888..2ca15e8107b4 100644
--- a/usr.sbin/IPXrouted/sap_input.c
+++ b/usr.sbin/IPXrouted/sap_input.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sap_input.c,v 1.6 1995/10/11 18:57:27 jhay Exp $
+ *	$Id: sap_input.c,v 1.1 1995/10/26 21:28:23 julian Exp $
  */
 
 /*
@@ -160,6 +160,7 @@ sap_input(from, size)
 						tsap->timer = 0;
 						break;
 					}
+					tsap = tsap->clone;
 				}
 				if (tsap == NULL) {
 					sap_add_clone(sap, n, from);