diff --git a/lib/nodelist.c b/lib/nodelist.c
index cf31c4f5..20da7e18 100644
--- a/lib/nodelist.c
+++ b/lib/nodelist.c
@@ -51,18 +51,6 @@ static int		getsrv(char**);
 
 
 
-struct _pkey pkey[] = {
-	{(char *)"Down",	NL_NODE,	NL_DOWN},
-	{(char *)"Hold",	NL_NODE,	NL_HOLD},
-	{(char *)"Region",	NL_REGION,	NL_REGION},
-	{(char *)"Host",	NL_HOST,	NL_HOST},
-	{(char *)"Hub",		NL_HUB,		NL_HUB},
-	{(char *)"Point",	NL_POINT,	NL_POINT},
-	{(char *)"Pvt",		NL_NODE,	NL_NODE},
-	{NULL,			0,		0}
-};
-
-
 /*
  * Table to parse the ~/etc/nodelist.conf file
  */
@@ -543,7 +531,7 @@ node *getnlent(faddr *addr)
 {
     FILE		    *fp, *np;
     static node		    nodebuf;
-    static char		    buf[2048], ebuf[2048], *p, *q, tbuf[256];
+    static char		    buf[MAXNLLINELEN], ebuf[MAXNLLINELEN], *p, *q, tbuf[256];
     struct _ixentry	    xaddr;
     int			    i, Found = FALSE, ixflag, stdflag, ndrecord = FALSE;
     char		    *mydomain, *path, *r;
diff --git a/lib/nodelist.conf b/lib/nodelist.conf
index 77a31d9c..05386c99 100644
--- a/lib/nodelist.conf
+++ b/lib/nodelist.conf
@@ -75,7 +75,6 @@ reqbits	RQ_WR	0x00000004	# Wazoo request
 reqbits	RQ_WU	0x00000008	# Wazoo update
 
 
-
 # Network services, the valid IP flags translated to the internet service
 # names and their default ports.
 #
diff --git a/lib/nodelist.h b/lib/nodelist.h
index beaf5a08..dfb39021 100644
--- a/lib/nodelist.h
+++ b/lib/nodelist.h
@@ -5,9 +5,9 @@
 
 #include "../config.h"
 
-#define MAXNAME 35
-#define MAXUFLAGS 16
-
+#define MAXNAME		35
+#define MAXUFLAGS	16
+#define	MAXNLLINELEN	1024
 
 
 /*