diff -ur --new-file old/atm/BUGS new/atm/BUGS
--- old/atm/BUGS	Tue Nov  3 18:36:43 1998
+++ new/atm/BUGS	Fri Nov  6 16:36:58 1998
@@ -1,4 +1,4 @@
-Known bugs and restrictions in version 0.50
+Known bugs and restrictions in version 0.51
 ===========================================
 
  - ANS: libresolve conflicts with libc on some systems
diff -ur --new-file old/atm/CHANGES new/atm/CHANGES
--- old/atm/CHANGES	Tue Nov  3 18:45:14 1998
+++ new/atm/CHANGES	Fri Nov  6 16:36:22 1998
@@ -1,3 +1,20 @@
+Version 0.50 to 0.51 (6-NOV-1998)
+====================
+
+Bug fixes
+---------
+
+ - atmsigd: typo prevented kernel.c from compiling with UNI30 disabled (fix by
+   Andrew Lunn and Uwe Dannowski)
+ - option -u crashed ilmid (reported by Michael Wolf)
+
+Other changes
+-------------
+
+ - bearer capability is now set to "CBR" for CBR (suggested by Heikki
+   Vatiainen)
+
+
 Version 0.49 to 0.50 (3-NOV-1998)
 ====================
 
diff -ur --new-file old/atm/README new/atm/README
--- old/atm/README	Tue Nov  3 17:29:08 1998
+++ new/atm/README	Fri Nov  6 16:36:27 1998
@@ -1,4 +1,4 @@
-ATM on Linux, release 0.50 (alpha)        by Werner Almesberger, EPFL ICA
+ATM on Linux, release 0.51 (alpha)        by Werner Almesberger, EPFL ICA
 ============================================== Werner.Almesberger@epfl.ch
 
 This is experimental software. There are known major bugs and certainly
diff -ur --new-file old/atm/USAGE new/atm/USAGE
--- old/atm/USAGE	Tue Nov  3 18:26:59 1998
+++ new/atm/USAGE	Fri Nov  6 16:37:41 1998
@@ -1,4 +1,4 @@
-Usage instructions  -  ATM on Linux, release 0.50
+Usage instructions  -  ATM on Linux, release 0.51
 -------------------------------------------------
 
 For updates of ATM on Linux, please check the Web page at  
@@ -17,7 +17,7 @@
 In order to install this package, you need 
 
   - the package itself  
-    ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.50.tar.gz  
+    ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.51.tar.gz  
   - the Linux kernel, version 2.1.126, e.g. from  
     ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.1.126.tar.gz  
   - Perl, version 4 or 5 
@@ -33,7 +33,7 @@
 all the files listed above there. Then extract the ATM on Linux 
 distribution:
 
-tar xfz atm-0.50.tar.gz
+tar xfz atm-0.51.tar.gz
 
 and the kernel source:
 
diff -ur --new-file old/atm/VERSION new/atm/VERSION
--- old/atm/VERSION	Tue Nov  3 17:29:00 1998
+++ new/atm/VERSION	Thu Nov  5 18:26:42 1998
@@ -1 +1 @@
-0.50
+0.51
diff -ur --new-file old/atm/doc/usage.tex new/atm/doc/usage.tex
--- old/atm/doc/usage.tex	Tue Nov  3 18:26:39 1998
+++ new/atm/doc/usage.tex	Fri Nov  6 16:36:48 1998
@@ -1,7 +1,7 @@
 %%def%:=
 
 %:\begin{verbatim}
-%:Usage instructions  -  ATM on Linux, release 0.50
+%:Usage instructions  -  ATM on Linux, release 0.51
 %:-------------------------------------------------
 %:
 %:\end{verbatim}
@@ -38,14 +38,14 @@
 
 \title{ATM on Linux \\
   User's guide \\
-  Release 0.50 (alpha)}
+  Release 0.51 (alpha)}
 \author{Werner Almesberger \\
   {\tt Werner.Almesberger@epfl.ch} \\
   \\
   Institute for computer Communications and Applications (ICA) \\
   EPFL, CH-1015 Lausanne, Switzerland}
  
-\date{November 3, 1998}
+\date{November 6, 1998}
 
 \begin{document}
 \maketitle
@@ -82,7 +82,7 @@
 In order to install this package, you need
 \begin{itemize}
   \item the package itself
-    \url{ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.50.tar.gz}
+    \url{ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.51.tar.gz}
   \item the Linux kernel, version 2.1.126, e.g. from
     \url{ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.1.126.tar.gz}
   \item Perl, version 4 or 5
@@ -99,7 +99,7 @@
 distribution:
 
 \begin{verbatim}
-tar xfz atm-0.50.tar.gz
+tar xfz atm-0.51.tar.gz
 \end{verbatim}
 
 and the kernel source:
diff -ur --new-file old/atm/doc/usage.txt new/atm/doc/usage.txt
--- old/atm/doc/usage.txt	Tue Nov  3 18:26:59 1998
+++ new/atm/doc/usage.txt	Fri Nov  6 16:37:41 1998
@@ -1,4 +1,4 @@
-Usage instructions  -  ATM on Linux, release 0.50
+Usage instructions  -  ATM on Linux, release 0.51
 -------------------------------------------------
 
 For updates of ATM on Linux, please check the Web page at  
@@ -17,7 +17,7 @@
 In order to install this package, you need 
 
   - the package itself  
-    ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.50.tar.gz  
+    ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.51.tar.gz  
   - the Linux kernel, version 2.1.126, e.g. from  
     ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.1.126.tar.gz  
   - Perl, version 4 or 5 
@@ -33,7 +33,7 @@
 all the files listed above there. Then extract the ATM on Linux 
 distribution:
 
-tar xfz atm-0.50.tar.gz
+tar xfz atm-0.51.tar.gz
 
 and the kernel source:
 
diff -ur --new-file old/atm/ilmid/ilmid.c new/atm/ilmid/ilmid.c
--- old/atm/ilmid/ilmid.c	Sat Oct 10 11:19:54 1998
+++ new/atm/ilmid/ilmid.c	Thu Nov  5 19:31:19 1998
@@ -56,7 +56,7 @@
 
 void usage(char *name)
 {
-  fprintf(stderr, "usage: %s [-b] [-d] [-v] [-l logfile] [-x] [-q qos] "
+  fprintf(stderr, "usage: %s [-b] [-d] [-v] [-l logfile] [-x] [-q qos]\n"
     "%13s[ -i local_ip ] "
 #ifdef DYNAMIC_UNI
     "[ -u uni ] "
@@ -275,7 +275,7 @@
   qos = NULL;
   while((opt = getopt(argc, argv, "bdhi:l:q:xv"
 #ifdef DYNAMIC_UNI
-    "u"
+    "u:"
 #endif
     )) != EOF)
     switch (opt)
@@ -315,6 +315,7 @@
 	else if (!strcmp(optarg,"4.0") || !strcmp(optarg,"40"))
 	  atmfAtmLayerUniVersionValue = 4; // version4point0(4)
 	else usage(argv[0]);
+	break;
 #endif
       case 'h':
       default:
diff -ur --new-file old/atm/ilmid/mib.c new/atm/ilmid/mib.c
--- old/atm/ilmid/mib.c	Thu Oct  8 20:47:03 1998
+++ new/atm/ilmid/mib.c	Thu Nov  5 19:31:11 1998
@@ -373,17 +373,14 @@
 static AsnInt put_ci(VarBind *varbind,Variable *var,
   struct atm_cirange *ci,char *bits)
 {
-  int tmp;
-
   if (get_ci_range(ci) < 0) return GENERR;
   diag(COMPONENT,DIAG_DEBUG,"VPI: %d bits, VCI: %d bits",ci->vpi_bits,
     ci->vci_bits);
-  tmp = *bits;
   varbind->value = Asn1Alloc(sizeof(struct ObjectSyntax));
   varbind->value->choiceId = OBJECTSYNTAX_SIMPLE;
   varbind->value->a.simple = Asn1Alloc(sizeof(struct SimpleSyntax));
   varbind->value->a.simple->choiceId = SIMPLESYNTAX_NUMBER;
-  varbind->value->a.simple->a.number = *((AsnInt *) var->value) = tmp;
+  varbind->value->a.simple->a.number = *((AsnInt *) var->value) = *bits;
   return NOERROR;
 }
 
@@ -402,5 +399,3 @@
 
   return put_ci(varbind,var,&ci,&ci.vci_bits);
 }
-
-
diff -ur --new-file old/atm/sigd/kernel.c new/atm/sigd/kernel.c
--- old/atm/sigd/kernel.c	Tue Nov  3 17:16:39 1998
+++ new/atm/sigd/kernel.c	Fri Nov  6 16:34:21 1998
@@ -91,14 +91,9 @@
 	error = sap_encode(&dsc,&sock->remote,&sock->sap,&sock->qos,
 	  sock->sig->uni);
     q_assign(&dsc,QF_bearer_class,16); /* BCOB-X */
-#if defined(UNI30) || defined(ALLOW_UNI30) || defined(DYNAMIC_UNI)
-    if (!error && sock->sig->uni & S_UNI30)
-	q_assign(&dsc,QF_trans_cap,ATM_TC_VBR_NRT_R00);
-	  /* force presence - UNI 3.0 wants this */
-#endif
     q_assign(&dsc,QF_upcc,0); /* p2p */
 #if !defined(UNI30) || defined(DYNAMIC_UNI)
-    if (!errror && sock->sig->uni != S_UNI30)
+    if (!error && sock->sig->uni != S_UNI30)
 	q_assign(&dsc,QF_qos_cs,Q2931_CS_ITU);
 #endif
     q_assign(&dsc,QF_qos_fw,0); /* QOS 0 */
diff -ur --new-file old/atm/sigd/sap.c new/atm/sigd/sap.c
--- old/atm/sigd/sap.c	Sun Nov  1 17:00:37 1998
+++ new/atm/sigd/sap.c	Fri Nov  6 16:34:09 1998
@@ -141,14 +141,17 @@
 	    q_write(dsc,QF_cdpn_esa,(void *) addr->sas_addr.prv,ATM_ESA_LEN);
 	else return -EDESTADDRREQ;
     if (qos->txtp.traffic_class == ATM_UBR || qos->rxtp.traffic_class ==
-      ATM_UBR) q_assign(dsc,QF_best_effort,0);
-#if defined(UNI40) || defined(DYNAMIC_UNI)
+      ATM_UBR) {
+	q_assign(dsc,QF_best_effort,0);
+#if defined(UNI30) || defined(ALLOW_UNI30) || defined(DYNAMIC_UNI)
+	if (uni & S_UNI30)
+	    q_assign(dsc,QF_trans_cap,ATM_TC_VBR_NRT_R00);
+	      /* force presence - UNI 3.0 wants this */
+#endif
+    }
     if (qos->txtp.traffic_class == ATM_CBR || qos->rxtp.traffic_class ==
-      ATM_CBR) {
-	if (!(uni & S_UNI40)) return -EINVAL;
+      ATM_CBR)
 	q_assign(dsc,QF_trans_cap,ATM_TC_CBR);
-    }
-#endif
     swi
.