diff --git a/README.md b/README.md
index 265e3ff..7860b3a 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ This supports the following RFC dictionaries at the moment:
 - [RFC2869](https://tools.ietf.org/html/rfc2869)
 - [RFC3162](https://tools.ietf.org/html/rfc3162)
 - [RFC3576](https://tools.ietf.org/html/rfc3576)
+- [RFC3580](https://tools.ietf.org/html/rfc3580)
 - [RFC4072](https://tools.ietf.org/html/rfc4072)
 - [RFC5090](https://tools.ietf.org/html/rfc5090)
 - [RFC5607](https://tools.ietf.org/html/rfc5607)
@@ -34,7 +35,6 @@ Simple example implementations are here:
 
 - retransmission feature on the client
 - Support the following RFC dictionaries:
-  - rfc3580
   - rfc4372
   - rfc4603
   - rfc4675
diff --git a/dicts/dictionary.rfc3580 b/dicts/dictionary.rfc3580
new file mode 100644
index 0000000..1852697
--- /dev/null
+++ b/dicts/dictionary.rfc3580
@@ -0,0 +1,19 @@
+# -*- text -*-
+# Copyright (C) 2020 The FreeRADIUS Server project and contributors
+# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0
+# Version $Id$
+#
+#	Attributes and values defined in RFC 3580.
+#	http://www.ietf.org/rfc/rfc3580.txt
+#
+#	$Id$
+#
+VALUE	Acct-Terminate-Cause		Supplicant-Restart	19
+VALUE	Acct-Terminate-Cause		Reauthentication-Failure	20
+VALUE	Acct-Terminate-Cause		Port-Reinit		21
+VALUE	Acct-Terminate-Cause		Port-Disabled		22
+
+VALUE	NAS-Port-Type			Token-Ring		20
+VALUE	NAS-Port-Type			FDDI			21
+
+VALUE	Tunnel-Type			VLAN			13
diff --git a/radius/src/lib.rs b/radius/src/lib.rs
index 0b8d35b..c6846d0 100644
--- a/radius/src/lib.rs
+++ b/radius/src/lib.rs
@@ -10,6 +10,7 @@ pub mod rfc2868;
 pub mod rfc2869;
 pub mod rfc3162;
 pub mod rfc3576;
+pub mod rfc3580;
 pub mod rfc4072;
 pub mod rfc5090;
 pub mod rfc5607;
diff --git a/radius/src/rfc3580.rs b/radius/src/rfc3580.rs
new file mode 100644
index 0000000..25838ce
--- /dev/null
+++ b/radius/src/rfc3580.rs
@@ -0,0 +1,14 @@
+// Code generated by machine generator; DO NOT EDIT.
+
+pub type AcctTerminateCause = u32;
+pub const ACCT_TERMINATE_CAUSE_SUPPLICANT_RESTART: AcctTerminateCause = 19;
+pub const ACCT_TERMINATE_CAUSE_REAUTHENTICATION_FAILURE: AcctTerminateCause = 20;
+pub const ACCT_TERMINATE_CAUSE_PORT_REINIT: AcctTerminateCause = 21;
+pub const ACCT_TERMINATE_CAUSE_PORT_DISABLED: AcctTerminateCause = 22;
+
+pub type NasPortType = u32;
+pub const NAS_PORT_TYPE_TOKEN_RING: NasPortType = 20;
+pub const NAS_PORT_TYPE_FDDI: NasPortType = 21;
+
+pub type TunnelType = u32;
+pub const TUNNEL_TYPE_VLAN: TunnelType = 13;