diff --git a/modulesets/freedesktop.modules b/modulesets/freedesktop.modules
index 5874539..fd906ce 100644
--- a/modulesets/freedesktop.modules
+++ b/modulesets/freedesktop.modules
@@ -7,9 +7,6 @@
   <repository type="cvs" name="dbus.freedesktop.org"
       cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/dbus"
       password=""/>
-  <repository type="cvs" name="hal.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/hal"
-      password=""/>
   <repository type="cvs" name="icon-theme.freedesktop.org"
       cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/icon-theme"
       password=""/>
@@ -157,7 +154,7 @@
   </autotools>
 
   <autotools id="PolicyKit">
-    <branch repo="hal.freedesktop.org"/>
+    <branch repo="git.freedesktop.org" module="PolicyKit"/>
     <dependencies>
       <dep package="dbus-glib"/>
     </dependencies>
@@ -175,21 +172,13 @@
   </tarball>
 
   <autotools id="hal">
-    <branch repo="hal.freedesktop.org"/>
+    <branch repo="git.freedesktop.org" module="hal"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="PolicyKit"/>
     </dependencies>
   </autotools>
 
-  <autotools id="hal-0-4">
-    <branch repo="hal.freedesktop.org" module="hal"
-            revision="hal-0_4-stable-branch" checkoutdir="hal-0.4"/>
-    <dependencies>
-      <dep package="dbus-0.23"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="fontconfig">
 	  <branch repo="git.freedesktop.org" module="fontconfig" /> 
   </autotools>
