diff --git a/activecluster/project.properties b/activecluster/project.properties
index b9bb4bd2cf..ed8dd3bd6f 100644
--- a/activecluster/project.properties
+++ b/activecluster/project.properties
@@ -1,4 +1,4 @@
-maven.repo.remote=http://www.ibiblio.org/maven,http://dist.codehaus.org,http://cvs.apache.org/repository
+maven.repo.remote=http://www.ibiblio.org/maven,http://dist.codehaus.org,http://people.apache.org/repository
 
 maven.compile.source=1.4
 maven.compile.target=1.4
diff --git a/activemq-gbean-management/project.properties b/activemq-gbean-management/project.properties
index ac1bf0f121..c7670b384c 100755
--- a/activemq-gbean-management/project.properties
+++ b/activemq-gbean-management/project.properties
@@ -6,4 +6,4 @@ maven.multiproject.type=jar
 maven.repo.remote=\
 http://www.ibiblio.org/maven,\
 http://dist.codehaus.org,\
-http://cvs.apache.org/repository
+http://people.apache.org/repository
diff --git a/activemq-gbean/project.properties b/activemq-gbean/project.properties
index ac1bf0f121..c7670b384c 100755
--- a/activemq-gbean/project.properties
+++ b/activemq-gbean/project.properties
@@ -6,4 +6,4 @@ maven.multiproject.type=jar
 maven.repo.remote=\
 http://www.ibiblio.org/maven,\
 http://dist.codehaus.org,\
-http://cvs.apache.org/repository
+http://people.apache.org/repository
diff --git a/activemq-jaas/project.properties b/activemq-jaas/project.properties
index fa48247840..e7ece06271 100644
--- a/activemq-jaas/project.properties
+++ b/activemq-jaas/project.properties
@@ -1,7 +1,7 @@
 maven.repo.remote=\
 http://dist.codehaus.org,\
 http://www.ibiblio.org/maven,\
-http://cvs.apache.org/repository
+http://people.apache.org/repository
 
 # -------------------------------------------------------------------
 # Build Properties
diff --git a/activemq-jmeter/project.properties b/activemq-jmeter/project.properties
index 50cac0354b..c1b49ffb5f 100755
--- a/activemq-jmeter/project.properties
+++ b/activemq-jmeter/project.properties
@@ -30,7 +30,7 @@ maven.dist.gunzip.executable=gunzip
 # ------------------------------------------------------------------------
 # M A V E N  P R O P E R T I E S
 # ------------------------------------------------------------------------
-maven.repo.remote=http://www.ibiblio.org/maven/, http://cvs.apache.org/repository, http://dist.codehaus.org, http://people.apache.org/~foconer/repository/
+maven.repo.remote=http://www.ibiblio.org/maven/, http://people.apache.org/repository, http://dist.codehaus.org, http://people.apache.org/~foconer/repository/
 
 # ------------------------------------------------------------------------
 # M A V E N  J A R  O V E R R I D E
@@ -90,4 +90,4 @@ antlr_version=2.7.2
 # Jars set explicity by path.
 # ------------------------------------------------------------------------
 # maven.jar.jorphan = ${maven.repo.local}/jorphan/jars/jorphan-1.0.jar
-# maven.jar.ApacheJMeter_core = ${maven.repo.local}/jmeter/jars/ApacheJMeter_core-1.1.jar
\ No newline at end of file
+# maven.jar.ApacheJMeter_core = ${maven.repo.local}/jmeter/jars/ApacheJMeter_core-1.1.jar
diff --git a/activemq-systest/project.properties b/activemq-systest/project.properties
index 777c5cfa7d..86974038bb 100755
--- a/activemq-systest/project.properties
+++ b/activemq-systest/project.properties
@@ -1,7 +1,7 @@
 maven.repo.remote=\
 http://dist.codehaus.org,\
 http://www.ibiblio.org/maven,\
-http://cvs.apache.org/repository
+http://people.apache.org/repository
 
 # -------------------------------------------------------------------
 # Build Properties
diff --git a/assembly/project.properties b/assembly/project.properties
index de57655bfb..e1efdc5086 100755
--- a/assembly/project.properties
+++ b/assembly/project.properties
@@ -15,7 +15,7 @@ maven.dist.gunzip.executable=gunzip
 maven.repo.remote=\
 http://www.ibiblio.org/maven,\
 http://dist.codehaus.org,\
-http://cvs.apache.org/repository,\
+http://people.apache.org/repository,\
 http://www.openejb.org/maven
 
 maven.jar.mainclass = org.apache.activemq.console.Main
diff --git a/etc/project.properties b/etc/project.properties
index db8c999f3f..cbeb31ea0d 100755
--- a/etc/project.properties
+++ b/etc/project.properties
@@ -4,7 +4,7 @@
 maven.repo.remote=\
 http://dist.codehaus.org,\
 http://www.ibiblio.org/maven,\
-http://cvs.apache.org/repository
+http://people.apache.org/repository
 
 maven.compile.source=1.4
 maven.compile.target=1.4
@@ -60,8 +60,8 @@ maven.checkstyle.header.file = ${basedir}/LICENSE.txt
 maven.xdoc.theme.url=http://codehaus.org/codehaus-style.css
 
 maven.repo.list=apache
-maven.repo.apache=scp://geronimo.apache.org
-maven.repo.apache.directory=/www/cvs.apache.org/repository
+maven.repo.apache=scp://people.apache.org
+maven.repo.apache.directory=/www/people.apache.org/repository
 maven.repo.apache.group=apcvs
 maven.repo.apache.ssh.executable=ssh
 maven.repo.apache.scp.executable=scp
diff --git a/project.properties b/project.properties
index 268e57db45..5d981d42a5 100755
--- a/project.properties
+++ b/project.properties
@@ -4,7 +4,7 @@
 maven.repo.remote=\
 http://dist.codehaus.org,\
 http://www.ibiblio.org/maven,\
-http://cvs.apache.org/repository
+http://people.apache.org/repository
 
 maven.multiproject.includes=\
 activecluster/project.xml,\
diff --git a/systest/itests/ear/project.properties b/systest/itests/ear/project.properties
index fc364329fe..364f538ecc 100755
--- a/systest/itests/ear/project.properties
+++ b/systest/itests/ear/project.properties
@@ -7,4 +7,4 @@ maven.ear.appxml=target/app/application.xml
 maven.repo.remote=\
 http://www.ibiblio.org/maven,\
 http://dist.codehaus.org,\
-http://cvs.apache.org/repository
+http://people.apache.org/repository