diff --git a/xep.ent b/xep.ent
index 8716d38a..8ec43d16 100644
--- a/xep.ent
+++ b/xep.ent
@@ -194,8 +194,8 @@
-XSF Board of Directors The XSF Board of Directors is an elected body that possesses overall responsibility for the affairs of the XMPP Standards Foundation. For further information, see <http://www.jabber.org/board/>." >
-XSF Bylaws The Bylaws of the XMPP Standards Foundation (XSF) define the legal basis and operating procedures of the XSF. For further information, see <http://www.jabber.org/xsf/docs/bylaws.shtml>." >
+XSF Board of Directors The XSF Board of Directors is an elected body that possesses overall responsibility for the affairs of the XMPP Standards Foundation. For further information, see <http://www.xmpp.org/xsf/board/>." >
+XSF Bylaws The Bylaws of the XMPP Standards Foundation (XSF) define the legal basis and operating procedures of the XSF. For further information, see <http://www.xmpp.org/xsf/docs/bylaws.shtml>." >
XMPP Council The XMPP Council is a technical steering committee, authorized by the XSF Board of Directors and elected by XSF members, that approves of new XMPP Extensions Protocols and oversees the XSF's standards process. For further information, see <http://www.xmpp.org/council/>." >
XMPP Extensions Editor The XMPP Extensions Editor is the individual appointed by the XSF Board of Directors to handle protocol submissions and provide day-to-day management of the XSF's standards process. For further information, see <http://www.xmpp.org/extensions/editor.shtml>." >
XMPP Standards Foundation (XSF) The XMPP Standards Foundation (XSF) is an independent, non-profit membership organization that develops open extensions to the IETF's Extensible Messaging and Presence Protocol (XMPP). For further information, see <http://www.xmpp.org/xsf/>." >
@@ -206,13 +206,13 @@
-jabberd The jabberd server is the original server implementation of the Jabber/XMPP protocols, first developed by Jeremie Miller, inventor of Jabber. For further information, see <http://jabberd.jabberstudio.org/>." >
+jabberd The jabberd server is the original server implementation of the Jabber/XMPP protocols, first developed by Jeremie Miller, inventor of Jabber. For further information, see <http://jabberd.org/>." >
The General Public License The General Public License is the primary code license for free software as defined by the Free Software Foundation. For further information, see <http://www.gnu.org/licenses/gpl.txt>." >
The Lesser General Public License The Lesser General Public License is a secondary code license for free software as defined by the Free Software Foundation. For further information, see <http://www.gnu.org/licenses/lgpl.txt>." >
-The Open Source Initiative The Open Source Initiative defines the term 'open source' and maintains a list of a open-source code licenses. For further information, see <http://www.opensource.org/>." >
+The Open Source Initiative The Open Source Initiative defines the term 'open source' and maintains a list of open-source code licenses. For further information, see <http://www.opensource.org/>." >
@@ -673,7 +673,7 @@
XMPP Extension Protocols XEP-0001: XMPP Extension Protocols <http://www.xmpp.org/extensions/xep-0001.html>." >
-Jabber Interest Groups XEP-0002: Jabber Interest Groups <http://www.xmpp.org/extensions/xep-0002.html>." >
+Special Interest Groups XEP-0002: Special Interest Groups <http://www.xmpp.org/extensions/xep-0002.html>." >
Proxy Accept Socket Service XEP-0002: Proxy Accept Socket Service <http://www.xmpp.org/extensions/xep-0003.html>." >
Data Forms XEP-0004: Data Forms <http://www.xmpp.org/extensions/xep-0004.html>." >
IQ-Based Avatars XEP-0008: IQ-Based Avatars <http://www.xmpp.org/extensions/xep-0008.html>." >