Index: user/Makefile
===================================================================
--- user/Makefile	(revision 1988)
+++ user/Makefile	(working copy)
@@ -152,6 +152,7 @@
 dir_$(CONFIG_USER_HD_HD)                    += hd
 dir_$(CONFIG_USER_HOSTAP_HOSTAP)            += hostap
 dir_$(CONFIG_USER_HEXEDIT_HEXEDIT)          += hexedit
+dir_$(CONFIG_USER_HNB)                      += hnb
 dir_$(CONFIG_USER_HOSTAP_HOSTAP)            += hostap/utils
 dir_$(CONFIG_USER_HOSTAP_HOSTAPD)           += hostap/hostapd
 dir_$(CONFIG_USER_HTTPD_HTTPD)              += httpd
Index: config/config.in
===================================================================
--- config/config.in	(revision 1988)
+++ config/config.in	(working copy)
@@ -790,6 +790,7 @@
 bool 'grep'			CONFIG_USER_GREP_GREP
 bool 'hd'			CONFIG_USER_HD_HD
 bool 'hexedit'			CONFIG_USER_HEXEDIT_HEXEDIT
+bool 'hnb'			CONFIG_USER_HNB
 bool 'lcalc'			CONFIG_USER_LCALC_LCALC
 bool 'lcd'			CONFIG_USER_LCD_LCD
 bool 'ledcon'			CONFIG_USER_LEDCON_LEDCON
Index: config/Configure.help
===================================================================
--- config/Configure.help	(revision 1988)
+++ config/Configure.help	(working copy)
@@ -497,6 +497,12 @@
 CONFIG_USER_LCALC_LCALC
   A simple, 4 function calculator
 
+CONFIG_USER_HNB
+  A hierarchical notebook(hnb) is a curses program to structure 
+  many kinds of data in one place, for example addresses, to-do lists,
+  ideas, book reviews or to store snippets of brainstorming. Writing 
+  structured documents and speech outlines.
+
 CONFIG_USER_ROUTE_IFCONFIG
   Required to configure network interfaces.
   Approx. binary size: 28k
Index: vendors/Nintendo/DLDI/config.vendor
===================================================================
--- vendors/Nintendo/DLDI/config.vendor	(revision 1988)
+++ vendors/Nintendo/DLDI/config.vendor	(working copy)
@@ -379,6 +379,7 @@
 # CONFIG_USER_GREP_GREP is not set
 # CONFIG_USER_HD_HD is not set
 CONFIG_USER_HEXEDIT_HEXEDIT=y
+CONFIG_USER_HNB=y
 CONFIG_USER_LCALC_LCALC=y
 # CONFIG_USER_LCD_LCD is not set
 # CONFIG_USER_LEDCON_LEDCON is not set
diff -urN user/hnb-1.9.17/Makefile user/hnb/Makefile
--- user/hnb-1.9.17/Makefile	2003-03-09 20:22:23.000000000 -0600
+++ user/hnb/Makefile	2007-10-16 15:52:51.000000000 -0500
@@ -1,9 +1,9 @@
 
 src/hnb: src/*.c src/*.h src/*.inc src/hnbrc.inc
 	(cd src;make)
-install: src/hnb
-	install -D src/hnb /usr/local/bin/hnb
-	install -D -m444 doc/hnb.1 /usr/local/man/man1/hnb.1
+#install: src/hnb
+#	install -D src/hnb /usr/local/bin/hnb
+#	install -D -m444 doc/hnb.1 /usr/local/man/man1/hnb.1
 clean:
 	(cd src;make clean)
 	(cd util;make clean)
@@ -18,3 +18,6 @@
 	cat doc/hnbrc | util/asc2c >> src/hnbrc.inc
 	echo "\"">>src/hnbrc.inc
 
+
+romfs:
+	$(ROMFSINST) src/hnb /bin/hnb
\ No newline at end of file
diff -urN user/hnb-1.9.17/src/Makefile user/hnb/src/Makefile
--- user/hnb-1.9.17/src/Makefile	2003-03-12 19:09:46.000000000 -0600
+++ user/hnb/src/Makefile	2007-08-08 18:00:21.000000000 -0500
@@ -1,5 +1,5 @@
-LIBS=-lncurses libcli/libcli.a
-CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
+LIBS+=-L$(ROOTDIR)/lib/libncurses/lib -lncurses libcli/libcli.a
+CFLAGS+=-I.. -I$(ROOTDIR)/lib/libncurses/include -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
 
 CFILES=$(wildcard *.c)
 OBJS=$(patsubst %.c,%.o,$(CFILES))
@@ -8,7 +8,7 @@
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
 
 hnb: libcli/libcli.a Makefile $(OBJS) init_subsystems.c *.h *.inc
-	$(CC) -o hnb $(OBJS) $(LIBS) $(CFLAGS)
+	$(CC) -o hnb $(LDFLAGS) $(OBJS) $(LIBS) $(CFLAGS)
 #	strip hnb
 libcli/libcli.a: libcli/*.c
 	(cd libcli;make libcli.a)
Binary files user/hnb-1.9.17/src/cli_history.o and user/hnb/src/cli_history.o differ
Binary files user/hnb-1.9.17/src/hnb.gdb and user/hnb/src/hnb.gdb differ
diff -urN user/hnb-1.9.17/src/libcli/Makefile user/hnb/src/libcli/Makefile
--- user/hnb-1.9.17/src/libcli/Makefile	2003-03-12 06:09:07.000000000 -0600
+++ user/hnb/src/libcli/Makefile	2007-08-08 17:44:24.000000000 -0500
@@ -1,13 +1,13 @@
-CFLAGS = -Wall
+CFLAGS += -Wall
 
 OBJS = cli.o cli_history.o cli_tokenize.o
 
-all: libcli.a libcli.so test-static test-shared 
+all: libcli.a #libcli.so test-static test-shared 
 
 clean:
 	rm -f *.o *.a *.so test-s* *~
 libcli.a: $(OBJS)
-	ar rc libcli.a cli*.o
+	arm-linux-elf-ar rc libcli.a cli*.o
 libcli_p.a: 
 	$(CC) -pg -c cli.c
 	$(CC) -pg -c cli_history.c
diff -urN user/hnb-1.9.17/src/ui_draw.c user/hnb/src/ui_draw.c
--- user/hnb-1.9.17/src/ui_draw.c	2003-03-09 18:44:29.000000000 -0600
+++ user/hnb/src/ui_draw.c	2007-08-08 17:41:52.000000000 -0500
@@ -39,9 +39,9 @@
 
 #define KEEPLINES 5
 
-int nodes_above;
-int active_line;
-int nodes_below;
+extern int nodes_above;
+extern int active_line;
+extern int nodes_below;
 
 static Node *up (Node *sel, Node *node)
 {