diff --git a/xep-0020.xml b/xep-0020.xml
index 1908a0fd..b853eead 100644
--- a/xep-0020.xml
+++ b/xep-0020.xml
@@ -271,7 +271,7 @@
 
   <xs:import 
       namespace='jabber:x:data'
-      schemaLocation='http://jabber.org/protocol/x-data/x-data.xsd'/>
+      schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
 
   <xs:annotation>
     <xs:documentation>
diff --git a/xep-0045.xml b/xep-0045.xml
index a8760b48..611bfef4 100644
--- a/xep-0045.xml
+++ b/xep-0045.xml
@@ -5147,7 +5147,7 @@ xmpp:darkcave@macbeth.shakespeare.lit?invite;jid=hecate@shakespeare.lit;password
 
   <xs:import 
       namespace='jabber:x:data'
-      schemaLocation='http://jabber.org/protocol/x-data/x-data.xsd'/>
+      schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
 
   <xs:element name='query'>
     <xs:complexType>
diff --git a/xep-0055.xml b/xep-0055.xml
index c61fc80f..7bb82c2f 100644
--- a/xep-0055.xml
+++ b/xep-0055.xml
@@ -284,7 +284,7 @@
     elementFormDefault='qualified'>
 
   <xs:import namespace='jabber:x:data'
-             schemaLocation='http://jabber.org/protocol/x-data/x-data.xsd'/>
+             schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
 
   <xs:annotation>
     <xs:documentation>
diff --git a/xep-0060.xml b/xep-0060.xml
index ea158ab6..17be51f7 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -5859,7 +5859,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=unsubscribe;node=princely_musings
 
   <xs:import
       namespace='jabber:x:data'
-      schemaLocation='http://jabber.org/protocol/x-data/x-data.xsd'/>
+      schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
 
   <xs:element name='pubsub'>
     <xs:complexType>
@@ -6159,7 +6159,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=unsubscribe;node=princely_musings
 
   <xs:import
       namespace='jabber:x:data'
-      schemaLocation='http://jabber.org/protocol/x-data/x-data.xsd'/>
+      schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
 
   <xs:element name='event'>
     <xs:complexType>
@@ -6303,7 +6303,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=unsubscribe;node=princely_musings
 
   <xs:import
       namespace='jabber:x:data'
-      schemaLocation='http://jabber.org/protocol/x-data/x-data.xsd'/>
+      schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
 
   <xs:element name='pubsub'>
     <xs:complexType>
diff --git a/xep-0077.xml b/xep-0077.xml
index 808e045c..5dee5f82 100644
--- a/xep-0077.xml
+++ b/xep-0077.xml
@@ -813,10 +813,10 @@ xmpp:marlowe.shakespeare.lit?unregister
 
   <xs:import 
       namespace='jabber:x:data'
-      schemaLocation='http://jabber.org/protocol/x-data/x-data.xsd'/>
+      schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
   <xs:import 
       namespace='jabber:x:oob'
-      schemaLocation='http://jabber.org/protocol/oob/x-oob.xsd'/>
+      schemaLocation='http://www.xmpp.org/schemas/x-oob.xsd'/>
 
   <xs:annotation>
     <xs:documentation>
diff --git a/xep-0095.xml b/xep-0095.xml
index 9fb0950f..7f724107 100644
--- a/xep-0095.xml
+++ b/xep-0095.xml
@@ -334,7 +334,7 @@
   
   <xs:import 
       namespace='http://jabber.org/protocol/feature-neg'
-      schemaLocation='http://jabber.org/protocol/feature-neg/feature-neg.xsd'/>
+      schemaLocation='http://www.xmpp.org/schemas/feature-neg.xsd'/>
 
   <xs:annotation>
     <xs:documentation>