diff --git a/calendar/calendar-hbm/src/main/resources/org/sakaiproject/calendar/dao/hbm/OpaqueUrl.hbm.xml b/calendar/calendar-hbm/src/main/resources/org/sakaiproject/calendar/dao/hbm/OpaqueUrl.hbm.xml
index 39743cc5e3e8..f3868ce8efc2 100644
--- a/calendar/calendar-hbm/src/main/resources/org/sakaiproject/calendar/dao/hbm/OpaqueUrl.hbm.xml
+++ b/calendar/calendar-hbm/src/main/resources/org/sakaiproject/calendar/dao/hbm/OpaqueUrl.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
 	<!--
diff --git a/common/ddl/hibernate.cfg.xml b/common/ddl/hibernate.cfg.xml
index 6357f02b2939..4e2d64996821 100644
--- a/common/ddl/hibernate.cfg.xml
+++ b/common/ddl/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-configuration PUBLIC
 		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+		"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
         <!-- these mapping resource paths must point to your hibernate template files (.hbm.xml),
diff --git a/dashboard/hbm/src/java/org/sakaiproject/dash/dao/JobRunImpl.hbm.xml b/dashboard/hbm/src/java/org/sakaiproject/dash/dao/JobRunImpl.hbm.xml
index 9cc14577346f..5189f5358fca 100644
--- a/dashboard/hbm/src/java/org/sakaiproject/dash/dao/JobRunImpl.hbm.xml
+++ b/dashboard/hbm/src/java/org/sakaiproject/dash/dao/JobRunImpl.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping
     PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 	<class name="org.sakaiproject.dash.dao.JobRunImpl"
 		table="DASH_JOB_RUN"
diff --git a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodeMetaData.hbm.xml b/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodeMetaData.hbm.xml
index 6d7090fb2dd0..66ed281e4a3e 100644
--- a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodeMetaData.hbm.xml
+++ b/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodeMetaData.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
    <!-- put your value object in the class name, 
diff --git a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodePermission.hbm.xml b/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodePermission.hbm.xml
index 68980edd5546..52c83565e5c1 100644
--- a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodePermission.hbm.xml
+++ b/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodePermission.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
     <!--
diff --git a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyPersistentNode.hbm.xml b/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyPersistentNode.hbm.xml
index 09e7233a5444..d1945546bd8d 100644
--- a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyPersistentNode.hbm.xml
+++ b/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyPersistentNode.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
    <!-- put your value object in the class name, 
diff --git a/hierarchy/impl/src/ddl/hibernate.cfg.xml b/hierarchy/impl/src/ddl/hibernate.cfg.xml
index 87eacab940e5..0fa9e4b5fce3 100644
--- a/hierarchy/impl/src/ddl/hibernate.cfg.xml
+++ b/hierarchy/impl/src/ddl/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-configuration PUBLIC
 		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+		"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
         <!-- these mapping resource paths must point to your hibernate template files (.hbm.xml),
diff --git a/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/MessageMoveHistory.hbm.xml b/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/MessageMoveHistory.hbm.xml
index 0cd502453892..e0b82cfcda42 100644
--- a/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/MessageMoveHistory.hbm.xml
+++ b/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/MessageMoveHistory.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping
     PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
 
diff --git a/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/Rank.hbm.xml b/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/Rank.hbm.xml
index ab127c860153..9356253910cd 100644
--- a/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/Rank.hbm.xml
+++ b/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/Rank.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping
     PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
 
diff --git a/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/RankImage.hbm.xml b/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/RankImage.hbm.xml
index 519e1b1e8cc4..bd1dd2a2b6b9 100644
--- a/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/RankImage.hbm.xml
+++ b/msgcntr/messageforums-hbm/src/java/org/sakaiproject/component/app/messageforums/dao/hibernate/RankImage.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping
     PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
 
diff --git a/profile2/ddl/hibernate.cfg.xml b/profile2/ddl/hibernate.cfg.xml
index 6fe5f43e9afc..186d9d8da40a 100644
--- a/profile2/ddl/hibernate.cfg.xml
+++ b/profile2/ddl/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-configuration PUBLIC
 		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+		"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
         <!-- these mapping resource paths must point to your hibernate template files (.hbm.xml),
diff --git a/samigo/samigo-services/src/test/hibernate.cfg.xml b/samigo/samigo-services/src/test/hibernate.cfg.xml
index 1f8c4503024a..8090858ae691 100644
--- a/samigo/samigo-services/src/test/hibernate.cfg.xml
+++ b/samigo/samigo-services/src/test/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-configuration PUBLIC
 		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+		"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
         <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
diff --git a/shortenedurl/ddl/hibernate.cfg.xml b/shortenedurl/ddl/hibernate.cfg.xml
index c59e49c78818..cfcf1042b34f 100644
--- a/shortenedurl/ddl/hibernate.cfg.xml
+++ b/shortenedurl/ddl/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-configuration PUBLIC
 		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+		"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
         	<mapping resource="org/sakaiproject/shortenedurl/hbm/RandomisedUrl.hbm.xml" />
diff --git a/signup/api/src/java/org/sakaiproject/signup/hbm/SignupMeeting.hbm.xml b/signup/api/src/java/org/sakaiproject/signup/hbm/SignupMeeting.hbm.xml
index a5cc0f5a1991..cd3ddbeec53f 100644
--- a/signup/api/src/java/org/sakaiproject/signup/hbm/SignupMeeting.hbm.xml
+++ b/signup/api/src/java/org/sakaiproject/signup/hbm/SignupMeeting.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-cascade="none" package="org.sakaiproject.signup.model" default-lazy="false">
 	<class name="org.sakaiproject.signup.model.SignupMeeting"
diff --git a/signup/api/src/java/org/sakaiproject/signup/hbm/SignupSite.hbm.xml b/signup/api/src/java/org/sakaiproject/signup/hbm/SignupSite.hbm.xml
index 1b8af6214378..d157603d9f30 100644
--- a/signup/api/src/java/org/sakaiproject/signup/hbm/SignupSite.hbm.xml
+++ b/signup/api/src/java/org/sakaiproject/signup/hbm/SignupSite.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping  package="org.sakaiproject.signup.model" default-lazy="false">
 	<class name="org.sakaiproject.signup.model.SignupSite"
diff --git a/signup/api/src/java/org/sakaiproject/signup/hbm/SignupTimeslot.hbm.xml b/signup/api/src/java/org/sakaiproject/signup/hbm/SignupTimeslot.hbm.xml
index a234787bd1d9..1e8b951c9006 100644
--- a/signup/api/src/java/org/sakaiproject/signup/hbm/SignupTimeslot.hbm.xml
+++ b/signup/api/src/java/org/sakaiproject/signup/hbm/SignupTimeslot.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping  package="org.sakaiproject.signup.model" default-lazy="false">
 	<class name="org.sakaiproject.signup.model.SignupTimeslot"
diff --git a/sitestats/sitestats-impl-hib/src/ddl/hibernate.cfg.xml b/sitestats/sitestats-impl-hib/src/ddl/hibernate.cfg.xml
index 0db82c494dca..c46de07f30a2 100644
--- a/sitestats/sitestats-impl-hib/src/ddl/hibernate.cfg.xml
+++ b/sitestats/sitestats-impl-hib/src/ddl/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-configuration PUBLIC
 		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+		"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
     	<mapping resource="org/sakaiproject/sitestats/impl/hbm/PrefsImpl.hbm.xml" />