diff --git a/Makefile b/Makefile
index e52a71a1fe311fc5385bba142d04daa57cf3f1df..c2bad988a313b7518fb7628cadaf48752ebf67fd 100755
--- a/Makefile
+++ b/Makefile
@@ -359,6 +359,7 @@ bininstall: all
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
 	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
 	if [ -d contrib/firmware/iax ]; then \
 		install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
 	else \
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index e9d5cf5c9ed5c268cfc6be56ebc4838c131a6a99..b0bfc9080b8a3785c0fb81f91e6d5f5a0aac6db8 100755
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -78,6 +78,25 @@ jitterbuffer=no
 ;
 ;register => marko:[torkey]@tormenta.linux-support.net
 ;
+; Sample Registration for iaxtel
+;
+; Visit http://www.iaxtel.com to register with iaxtel.  Replace "user"
+; and "pass" with your username and password for iaxtel.  Incoming 
+; calls arrive at the "s" extension of "default" context.
+;
+;register => user:pass@iaxtel.com
+;
+; Sample Registration for IAX + FWD
+;
+; To register using IAX with FWD, it must be enabled by visiting the URL
+; http://www.fwdnet.net/index.php?section_id=112
+;
+; Note that you need an extension in you default context which matches
+; your free world dialup number.  Please replace "FWDNumber" with your
+; FWD number and "passwd" with your password.
+;
+;register => FWDNumber:passwd@iax.fwdnet.net
+;
 ;
 ; You can disable authentication debugging to reduce the amount of 
 ; debugging traffic.
@@ -111,14 +130,14 @@ context=default
 auth=rsa
 inkeys=iaxtel
 
-[iaxtel2]
 ;
-; Backwards compatible entry for IAXtel pre-RSA
+; Trust Caller*ID Coming from iax.fwdnet.net
 ;
+[iaxfwd]
 type=user
 context=default
-deny=0.0.0.0/0.0.0.0
-permit=216.207.245.47/255.255.255.255
+auth=rsa
+inkeys=freeworlddialup
 
 ;
 ; Further user sections may be added, specifying a context and a
diff --git a/keys/freeworlddialup.pub b/keys/freeworlddialup.pub
new file mode 100755
index 0000000000000000000000000000000000000000..4ba3faf6654acc2c2a85a16d28aa4fafe3df5c05
--- /dev/null
+++ b/keys/freeworlddialup.pub
@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCcE53oHNoe3sBSkvW3JaO8v5Z1
+CC+Cm+JgocGwmUek0hlQST1NUsFWfYIMd5z/Iunnd1GziXLqDYzCQeZUtJ6Y9J4A
+cA9wNv1eYWrlH7ozKWOv592+Y5xF0kqQ1jFt+5zFTP5myL9N439Evu/BWALHw0B4
+aML+CsGHg0uIe5ZjNwIDAQAB
+-----END PUBLIC KEY-----