diff --git a/TODO b/TODO
index 84d4a2dc1..507bded22 100644
--- a/TODO
+++ b/TODO
@@ -8,8 +8,6 @@ Some of the things (in very short form) that need to be done to E17...
   BUGS / FIXES
 -------------------------------------------------------------------------------
 
-* BUG: xdaliclock -transparent doesnt use shaped border (not handling shape
-  change later)
 ]]]
 
 [[[
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 64cb4daa5..381b6524e 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -5209,6 +5209,8 @@ _e_border_eval(E_Border *bd)
 		  if (bd->client.shaped)
 		    {
 		       bd->client.shaped = 0;
+		       if (!bd->bordername)
+			 bd->client.border.changed = 1;
 		    }
 	       }
 	     else
@@ -5216,12 +5218,18 @@ _e_border_eval(E_Border *bd)
 		  if (!bd->client.shaped)
 		    {
 		       bd->client.shaped = 1;
+		       if (!bd->bordername)
+			 bd->client.border.changed = 1;
 		    }
 	       }
 	     free(rects);
 	  }
 	else
-	  bd->client.shaped = 0;
+	  {
+	     bd->client.shaped = 0;
+	     if (!bd->bordername) 
+	       bd->client.border.changed = 1;
+	  }
 	bd->need_shape_merge = 1;
      }
    if (bd->client.mwm.fetch.hints)