diff --git a/AUTHORS b/AUTHORS
index f724f3d420..22a12d0f63 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2052,6 +2052,7 @@ And assorted fixes and enhancements by the people listed above and by:
 	David Richards <drichards [AT] alum.mit.edu>
 	Shusaku Ueda <ueda [AT] sra.co.jp>
 	Jonathan Perkins <jonathan.perkins [AT] ipaccess.com>
+	Holger Schurig <h.schurig [AT] mn-logistik.de>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
diff --git a/doc/ethereal.pod b/doc/ethereal.pod
index 3ddd96d1aa..93c8951def 100644
--- a/doc/ethereal.pod
+++ b/doc/ethereal.pod
@@ -2121,6 +2121,7 @@ B<http://www.ethereal.com>.
   David Richards           <drichards [AT] alum.mit.edu>
   Shusaku Ueda             <ueda [AT] sra.co.jp>
   Jonathan Perkins         <jonathan.perkins [AT] ipaccess.com>
+  Holger Schurig           <h.schurig [AT] mn-logistik.de>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.
diff --git a/packet-eap.c b/packet-eap.c
index 2a1bc999df..2ad7dcabde 100644
--- a/packet-eap.c
+++ b/packet-eap.c
@@ -2,7 +2,7 @@
  * Routines for EAP Extensible Authentication Protocol dissection
  * RFC 2284
  *
- * $Id: packet-eap.c,v 1.34 2003/04/20 11:36:13 guy Exp $
+ * $Id: packet-eap.c,v 1.35 2004/02/03 18:22:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -70,6 +70,7 @@ References:
 #define EAP_TYPE_NAK    3
 #define EAP_TYPE_TLS	13
 #define EAP_TYPE_LEAP	17
+#define EAP_TYPE_TTLS	21
 
 static const value_string eap_type_vals[] = {
   {EAP_TYPE_ID,  "Identity [RFC2284]" },
@@ -92,7 +93,7 @@ static const value_string eap_type_vals[] = {
   { 18,          "Nokia IP smart card authentication [Haverinen]" },
   { 19,          "SRP-SHA1 Part 1 [Carlson]" },
   { 20,          "SRP-SHA1 Part 2 [Carlson]" },
-  { 21,          "EAP-TTLS [Funk]" },
+  {EAP_TYPE_TTLS,"EAP-TTLS [Funk]" },
   { 22,          "Remote Access Service [Fields]" },
   { 23,          "UMTS Authentication and Key Agreement [Haverinen]" },
   { 24,          "EAP-3Com Wireless [Young]" },
@@ -431,6 +432,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       /*********************************************************************
                                   EAP-TLS
       **********************************************************************/
+      case EAP_TYPE_TTLS:
       case EAP_TYPE_TLS:
 	{
 	guint8 flags   = tvb_get_guint8(tvb, offset);