diff -ru dwm-0.3.orig/dwm.h dwm-0.3/dwm.h
--- dwm-0.3.orig/dwm.h	2006-07-19 14:43:28.000000000 +0200
+++ dwm-0.3/dwm.h	2006-07-19 16:12:26.000000000 +0200
@@ -7,6 +7,8 @@
 
 /********** CUSTOMIZE **********/
 
+#define ModKeyMask Mod1Mask /*Mod4Mask*/
+
 #define FONT				"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
 #define BGCOLOR				"#0a2c2d"
 #define FGCOLOR				"#ddeeee"
diff -ru dwm-0.3.orig/event.c dwm-0.3/event.c
--- dwm-0.3.orig/event.c	2006-07-19 14:43:28.000000000 +0200
+++ dwm-0.3/event.c	2006-07-19 16:15:52.000000000 +0200
@@ -20,27 +20,27 @@
 	{ ControlMask,			XK_1,		appendtag,	{ .i = Tdev } }, 
 	{ ControlMask,			XK_2,		appendtag,	{ .i = Twww } }, 
 	{ ControlMask,			XK_3,		appendtag,	{ .i = Twork } }, 
-	{ Mod1Mask,				XK_0,		view,		{ .i = Tscratch } }, 
-	{ Mod1Mask,				XK_1,		view,		{ .i = Tdev } }, 
-	{ Mod1Mask,				XK_2,		view,		{ .i = Twww } }, 
-	{ Mod1Mask,				XK_3,		view,		{ .i = Twork } }, 
-	{ Mod1Mask,				XK_j,		focusnext,		{ 0 } }, 
-	{ Mod1Mask,				XK_k,		focusprev,		{ 0 } },
-	{ Mod1Mask,				XK_m,		maximize,		{ 0 } }, 
-	{ Mod1Mask,				XK_space,	dotile,		{ 0 } }, 
-	{ Mod1Mask,				XK_Return,	zoom,		{ 0 } },
+	{ ModKeyMask,				XK_0,		view,		{ .i = Tscratch } }, 
+	{ ModKeyMask,				XK_1,		view,		{ .i = Tdev } }, 
+	{ ModKeyMask,				XK_2,		view,		{ .i = Twww } }, 
+	{ ModKeyMask,				XK_3,		view,		{ .i = Twork } }, 
+	{ ModKeyMask,				XK_j,		focusnext,		{ 0 } }, 
+	{ ModKeyMask,				XK_k,		focusprev,		{ 0 } },
+	{ ModKeyMask,				XK_m,		maximize,		{ 0 } }, 
+	{ ModKeyMask,				XK_space,	dotile,		{ 0 } }, 
+	{ ModKeyMask,				XK_Return,	zoom,		{ 0 } },
 	{ ControlMask|ShiftMask,XK_0,		heretag,	{ .i = Tscratch } }, 
 	{ ControlMask|ShiftMask,XK_1,		heretag,	{ .i = Tdev } }, 
 	{ ControlMask|ShiftMask,XK_2,		heretag,	{ .i = Twww } }, 
 	{ ControlMask|ShiftMask,XK_3,		heretag,	{ .i = Twork } }, 
-	{ Mod1Mask|ShiftMask,	XK_0,		replacetag,		{ .i = Tscratch } }, 
-	{ Mod1Mask|ShiftMask,	XK_1,		replacetag,		{ .i = Tdev } }, 
-	{ Mod1Mask|ShiftMask,	XK_2,		replacetag,		{ .i = Twww } }, 
-	{ Mod1Mask|ShiftMask,	XK_3,		replacetag,		{ .i = Twork } }, 
-	{ Mod1Mask|ShiftMask,	XK_c,		killclient,		{ 0 } }, 
-	{ Mod1Mask|ShiftMask,	XK_q,		quit,		{ 0 } },
-	{ Mod1Mask|ShiftMask,	XK_space,	dofloat,	{ 0 } }, 
-	{ Mod1Mask|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
+	{ ModKeyMask|ShiftMask,	XK_0,		replacetag,		{ .i = Tscratch } }, 
+	{ ModKeyMask|ShiftMask,	XK_1,		replacetag,		{ .i = Tdev } }, 
+	{ ModKeyMask|ShiftMask,	XK_2,		replacetag,		{ .i = Twww } }, 
+	{ ModKeyMask|ShiftMask,	XK_3,		replacetag,		{ .i = Twork } }, 
+	{ ModKeyMask|ShiftMask,	XK_c,		killclient,		{ 0 } }, 
+	{ ModKeyMask|ShiftMask,	XK_q,		quit,		{ 0 } },
+	{ ModKeyMask|ShiftMask,	XK_space,	dofloat,	{ 0 } }, 
+	{ ModKeyMask|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
 };
 
 /* static */
diff -ru dwm-0.3.orig/client.c dwm-0.3/client.c
--- dwm-0.3.orig/client.c	2006-07-19 14:43:28.000000000 +0200
+++ dwm-0.3/client.c	2006-07-19 16:16:00.000000000 +0200
@@ -239,11 +239,11 @@
 
 	XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button1, ModKeyMask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button2, ModKeyMask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button3, ModKeyMask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
 
 	if(!c->isfloat)