--- a/dwm.c	Sat Dec 13 20:20:26 2008 +0000
+++ b/dwm.c	Wed Dec 17 21:25:32 2008 +0000
@@ -128,6 +128,7 @@
 } Rule;
 
 /* function declarations */
+static void adjustborder(Client *c, Bool issingle);
 static void applyrules(Client *c);
 static void arrange(void);
 static void attach(Client *c);
@@ -245,6 +246,17 @@
 
 /* function implementations */
 void
+adjustborder(Client *c, Bool issingle) {
+	XWindowChanges wc;
+
+	wc.border_width = issingle ? 0 : borderpx;
+	if(c->bw != wc.border_width) {
+		c->bw = wc.border_width;
+		XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
+	}
+}
+
+void
 applyrules(Client *c) {
 	unsigned int i;
 	Rule *r;
@@ -924,10 +936,14 @@
 
 void
 monocle(void) {
+	unsigned int n;
 	Client *c;
 
-	for(c = nexttiled(clients); c; c = nexttiled(c->next))
+	for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++);
+	for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+		adjustborder(c, n == 1);
 		resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
+	}
 }
 
 void
@@ -1330,6 +1346,7 @@
 	if(!c)
 		return;
 	if(ISVISIBLE(c)) { /* show clients top down */
+		adjustborder(c, False);
 		XMoveWindow(dpy, c->win, c->x, c->y);
 		if(!lt[sellt]->arrange || c->isfloating)
 			resize(c, c->x, c->y, c->w, c->h, True);
@@ -1393,6 +1410,7 @@
 	/* master */
 	c = nexttiled(clients);
 	mw = mfact * ww;
+	adjustborder(c, n == 1);
 	resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
 	if(--n == 0)
@@ -1407,6 +1425,7 @@
 		h = wh;
 
 	for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+		adjustborder(c, False);
 		resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
 		       ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
 		if(h != wh)