diff -urN freeradius-server-2.1.8/share/dictionary.freeradius.internal freeradius-server-no-fa-key/share/dictionary.freeradius.internal
--- freeradius-server-2.1.8/share/dictionary.freeradius.internal	2009-12-30 09:44:35.000000000 -0600
+++ freeradius-server-no-fa-key/share/dictionary.freeradius.internal	2010-02-03 19:47:47.000000000 -0600
@@ -336,8 +336,6 @@
 #	these attributes.
 #
 ATTRIBUTE	WiMAX-MN-NAI				1900	string
-ATTRIBUTE	WiMAX-FA-IP-Address			1901	ipaddr
-ATTRIBUTE	WiMAX-MN-FA				1902	octets
 
 #
 #	Range:	1910-2999
diff -urN freeradius-server-2.1.8/src/modules/rlm_wimax/rlm_wimax.c freeradius-server-no-fa-key/src/modules/rlm_wimax/rlm_wimax.c
--- freeradius-server-2.1.8/src/modules/rlm_wimax/rlm_wimax.c	2009-12-30 09:44:35.000000000 -0600
+++ freeradius-server-no-fa-key/src/modules/rlm_wimax/rlm_wimax.c	2010-02-03 19:42:31.000000000 -0600
@@ -486,31 +486,6 @@
 	}
 
 	/*
-	 *	Generate MN-FA = H(FA-RK, "MN FA" | FA-IP | MN-NAI)
-	 */
-	ip = pairfind(request->reply->vps, 1901);
-	if (fa_rk && ip && mn_nai) {
-		HMAC_CTX_init(&hmac);
-		HMAC_Init_ex(&hmac, fa_rk->vp_octets, fa_rk->length,
-			     EVP_sha1(), NULL);
-		
-		HMAC_Update(&hmac, (const uint8_t *) "MN FA", 5);
-		HMAC_Update(&hmac, (const uint8_t *) &ip->vp_ipaddr, 4);
-		HMAC_Update(&hmac, (const uint8_t *) &mn_nai->vp_strvalue, mn_nai->length);
-
-		HMAC_Final(&hmac, &mip_rk_1[0], &rk1_len);
-
-		vp = radius_paircreate(request, &request->reply->vps,
-				       1902, PW_TYPE_OCTETS);
-		if (!vp) {
-			RDEBUG("WARNING: Failed creating WiMAX-MN-FA");
-		} else {
-			memcpy(vp->vp_octets, &mip_rk_1[0], rk1_len);
-			vp->length = rk1_len;
-		}
-	}
-
-	/*
 	 *	Give additional information about requests && responses
 	 *
 	 *	WiMAX-RRQ-MN-HA-SPI