diff --git a/Makefile b/Makefile
index 3b0a56a..de4b0eb 100755
--- a/Makefile
+++ b/Makefile
@@ -49,10 +49,13 @@ GIT_DIRS += gnus
 URL-gnus := http://git.gnus.org/gnus.git
 
 GIT_DIRS += w3
-URL-w3 := http://git.sv.gnu.org/r/w3.git
+URL-w3 := http://git.savannah.gnu.org/r/w3.git
 
 GIT_DIRS += bbdb
-URL-bbdb := http://git.savannah.nongnu.org/r/bbdb.git
+URL-bbdb := http://git.savannah.gnu.org/r/bbdb.git
+
+GIT_DIRS += auctex
+URL-auctex := http://git.savannah.gnu.org/r/auctex.git
 
 GIT_DIRS += emacs-jabber
 URL-emacs-jabber := git://emacs-jabber.git.sourceforge.net/gitroot/emacs-jabber/emacs-jabber
@@ -61,15 +64,11 @@ GIT_DIRS += doxymacs
 URL-doxymacs := git://doxymacs.git.sourceforge.net/gitroot/doxymacs/doxymacs
 
 GIT_DIRS += htmlize
-URL-htmlize := http://fly.srk.fer.hr/~hniksic/emacs/htmlize.git
+URL-htmlize := http://github.com/emacsmirror/htmlize.git
 
 #SVN_DIRS += ess
 #URL-ess := https://svn.r-project.org/ESS/trunk
 
-
-CVS_DIRS += auctex
-URL-auctex := :pserver:anonymous@cvs.savannah.gnu.org:/sources/auctex
-
 CVS_DIRS += reftex
 URL-reftex := :pserver:anonymous@cvs.savannah.gnu.org:/sources/auctex