diff --git a/MODULES b/MODULES
index 0601ae8d7..dfb34c3cd 100644
--- a/MODULES
+++ b/MODULES
@@ -1,4 +1,4 @@
- $OpenBSD: MODULES,v 1.158 2011/03/07 20:44:41 matthieu Exp $
+ $OpenBSD: MODULES,v 1.159 2011/03/20 17:33:33 matthieu Exp $
 #
 # X.Org maintained modules
 #
@@ -54,7 +54,7 @@ app/xgc			1.0.3	7.6
 app/xhost		1.0.4	7.6
 app/xinit		1.3.0	7.6
 app/xinput		1.5.3	7.6
-app/xkbcomp		1.2.1	7.6+	needs-update
+app/xkbcomp		1.2.1	7.6+
 app/xkbevd		1.1.2	7.6
 app/xkbprint		1.0.3	7.6
 app/xkbutils		1.0.3	7.6
@@ -96,8 +96,8 @@ driver/xf86-input-elographics	1.2.4	7.5+
 driver/xf86-input-fpit		1.3.0	7.4+	needs-release
 driver/xf86-input-hyperpen	1.3.0	7.4+	needs-release
 driver/xf86-input-joystick	1.5.0	7.5
-driver/xf86-input-keyboard	1.5.0	7.6
-driver/xf86-input-mouse		1.6.0	7.6
+driver/xf86-input-keyboard	1.6.0	7.6+	needs-update
+driver/xf86-input-mouse		1.7.0	7.6+	needs-update
 driver/xf86-input-mutouch	1.2.1	7.4+	needs-release
 driver/xf86-input-penmount	1.4.1	7.5+
 driver/xf86-input-vmmouse	12.6.10	7.6
@@ -176,7 +176,7 @@ font/xfree86-type1		1.0.3
 lib/libFS			1.0.3	7.6
 lib/libICE			1.0.6	7.5
 lib/libSM			1.2.0	7.6
-lib/libX11			1.4.1	7.6	needs-update
+lib/libX11			1.4.2	7.6+	needs-update
 lib/libXRes			1.0.5	7.6
 lib/libXScrnSaver		1.2.1	7.6
 lib/libXau			1.0.6	7.6
@@ -186,11 +186,11 @@ lib/libXcursor			1.1.11	7.6
 lib/libXdamage			1.1.3	7.5+
 lib/libXdmcp			1.1.0	7.6
 lib/libXext			1.2.0	7.6
-lib/libXfixes			4.0.5	7.5+
+lib/libXfixes			5.0	7.6+	needs-update
 lib/libXfont			1.4.3	7.6
 lib/libXfontcache		1.0.5	7.5
 lib/libXft			2.2.0	7.6
-lib/libXi			1.4.1	7.6+	needs-update
+lib/libXi			1.4.2	7.6+	needs-update
 lib/libXinerama			1.1.1	7.6
 lib/libXmu			1.1.0	7.6
 lib/libXpm			3.5.9	7.6
@@ -218,8 +218,8 @@ proto/bigreqsproto		1.1.1	7.6
 proto/compositeproto		0.4.2	7.6
 proto/damageproto		1.2.1	7.6
 proto/dri2proto			2.3	7.5+
-proto/dmxproto			2.3.1	7.6	needs-update
-proto/fixesproto		4.1.2	7.6
+proto/dmxproto			2.3.1	7.6
+proto/fixesproto		5.0	7.6+	needs-update
 proto/fontcacheproto		0.1.3	7.5
 proto/fontsproto		2.1.1	7.6
 proto/glproto			1.4.12	7.6
@@ -238,15 +238,15 @@ proto/xcmiscproto		1.2.1	7.6
 proto/xextproto			7.2.0	7.6+	needs-update
 proto/xf86bigfontproto		1.2.0	7.4+
 proto/xf86dgaproto		2.1	7.5
-proto/xf86driproto		2.1.1	7.6	needs-update
+proto/xf86driproto		2.1.1	7.6
 proto/xf86miscproto		0.9.3	7.5
-proto/xf86vidmodeproto		2.3.1	7.6	needs-update
-proto/xineramaproto		1.2.1	7.6	needs-update
+proto/xf86vidmodeproto		2.3.1	7.6
+proto/xineramaproto		1.2.1	7.6
 
 util/cf				1.0.4	7.6	needs-update
 util/gccmakedep			1.0.2
 util/imake			1.0.4	7.6
-util/macros			1.11.0	7.6+	needs-update
+util/macros			1.13.0	7.6+
 util/makedepend			1.0.3	7.6
 
 xserver				1.10.0	7.6+	needs-update