diff -Nur ksymoops-2.3.5/Changelog ksymoops-2.3.6/Changelog
--- ksymoops-2.3.5/Changelog	Mon Nov  6 16:37:55 2000
+++ ksymoops-2.3.6/Changelog	Mon Jan  1 16:56:53 2001
@@ -1,3 +1,12 @@
+2001-01-01  Keith Owens  <kaos@ocs.com.au>
+
+	ksymoops 2.3.6
+
+	* Add INSTALL_MANDIR to Makefile and spec.
+	* Extra IA64 lines.
+	* Alpha changed 'Trace: '  to 'Trace:'.
+	* Add note about using bfd from non-standard location.
+
 2000-11-06  Keith Owens  <kaos@ocs.com.au>
 
 	ksymoops 2.3.5
diff -Nur ksymoops-2.3.5/INSTALL ksymoops-2.3.6/INSTALL
--- ksymoops-2.3.5/INSTALL	Tue Oct 19 08:21:36 1999
+++ ksymoops-2.3.6/INSTALL	Sat Dec 23 10:51:57 2000
@@ -24,3 +24,11 @@
 However I recommend that you keep this code outside the kernel.  It was never
 meant to be part of the kernel sources but somebody (not me) asked Linus to
 include it.
+
+Compiling and linking against a non-standard binutils.
+======================================================
+
+If you need to compile and link against a version of binutils which is
+not in the standard location, be careful to define the location of the
+bfd include files as well as libbfd.  Add -I/non/standard/bfd to
+CFLAGS; add -L/non/standard/bfd to the link line, just before -lbfd.
diff -Nur ksymoops-2.3.5/Makefile ksymoops-2.3.6/Makefile
--- ksymoops-2.3.5/Makefile	Sat Jul  1 21:49:09 2000
+++ ksymoops-2.3.6/Makefile	Tue Nov 21 11:54:53 2000
@@ -53,6 +53,9 @@
 ifneq ($(strip $(DEF_MAP)),)
 	CFLAGS += -DDEF_MAP=$(strip $(DEF_MAP))
 endif
+ifeq ($(strip $(INSTALL_MANDIR)),)
+	INSTALL_MANDIR := $(INSTALL_PREFIX)/man
+endif
 
 OBJECTS = io.o ksyms.o ksymoops.o map.o misc.o object.o oops.o re.o symbol.o
 
@@ -72,5 +75,5 @@
 install: all
 	$(INSTALL) -d $(INSTALL_PREFIX)/bin
 	$(INSTALL) ksymoops $(INSTALL_PREFIX)/bin
-	$(INSTALL) -d $(INSTALL_PREFIX)/man/man8
-	$(INSTALL) ksymoops.8 $(INSTALL_PREFIX)/man/man8
+	$(INSTALL) -d $(INSTALL_MANDIR)/man8
+	$(INSTALL) ksymoops.8 $(INSTALL_MANDIR)/man8
diff -Nur ksymoops-2.3.5/ksymoops.spec ksymoops-2.3.6/ksymoops.spec
--- ksymoops-2.3.5/ksymoops.spec	Mon Nov  6 16:37:55 2000
+++ ksymoops-2.3.6/ksymoops.spec	Tue Nov 21 11:56:05 2000
@@ -1,6 +1,6 @@
 Summary: Kernel oops and error message decoder
 Name: ksymoops
-Version: 2.3.5
+Version: 2.3.6
 Release: 1
 Copyright: GPL
 Group: Utilities/System
@@ -21,7 +21,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make INSTALL_PREFIX=$RPM_BUILD_ROOT/usr install
+make INSTALL_PREFIX=$RPM_BUILD_ROOT/usr \
+     INSTALL_MANDIR=$RPM_BUILD_ROOT/%{_mandir} \
+     install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff -Nur ksymoops-2.3.5/oops.c ksymoops-2.3.6/oops.c
--- ksymoops-2.3.5/oops.c	Mon Nov  6 16:34:56 2000
+++ ksymoops-2.3.6/oops.c	Sat Dec 23 10:51:57 2000
@@ -1081,7 +1081,7 @@
     RE_COMPILE(&re_Oops_trace,
 	    "^("						     /* 1 */
 		    "(Call Trace: )"				     /* 2 */
-    /* alpha */     "|(Trace: )"				     /* 3 */
+    /* alpha */     "|(Trace:)"					     /* 3 */
     /* various */   "|(" BRACKETED_ADDRESS ")"			     /* 4,5 */
     /* ppc */	    "|(Call backtrace:)"			     /* 6 */
     /* ppc, s390 */ "|" UNBRACKETED_ADDRESS			     /* 7 */
@@ -1464,7 +1464,7 @@
      * anybody wants to print a VERSION_nnnn line in their Oops, this code
      * is ready.
      *
-     * string 9 is defined if the text is 'Trace: ' (alpha).
+     * string 9 is defined if the text is 'Trace:' (alpha).
      * string 10 is defined if the text is 'Call backtrace:' (ppc, i370).
      * string 11 is defined if the text is 'bh:' (i386).  Stack addresses are
      * on the next line.  In our typical inconsistent manner, the bh: stack
@@ -1503,7 +1503,7 @@
     /* various */   "|(Call Trace: )"			/*  5  T */
     /* various */   "|(" BRACKETED_ADDRESS ")"		/* 6,7 T */
     /* various */   "|(Version_[0-9]+)"			/*  8 */
-    /* alpha */	    "|(Trace: )"			/*  9  T */
+    /* alpha */	    "|(Trace:)"				/*  9  T */
     /* ppc, i370 */ "|(Call backtrace:)"		/* 10  T */
     /* i386 */	    "|(bh:)"				/* 11  T */
     /* i386 */	    "|" REVBRACKETED_ADDRESS		/* 12  T */
@@ -1638,7 +1638,8 @@
     /* ia64 */	    "|rnat *: "
     /* ia64 */	    "|ldrs *: "
     /* ia64 */	    "|[bfr][0-9]+ *: "
-    /* any other mips lines to print? */
+    /* ia64 */	    "|General Exception"
+    /* any other ia64 lines to print? */
 
 		")",
 	REG_NEWLINE|REG_EXTENDED|REG_ICASE,