--- xmonad-contrib-0.10/xmonad-contrib.cabal~	2011-11-19 08:26:06.000000000 +0900
+++ xmonad-contrib-0.10/xmonad-contrib.cabal	2012-06-11 10:59:49.665575897 +0900
@@ -61,7 +61,7 @@
         extensions: ForeignFunctionInterface
         cpp-options: -DXFT
 
-    build-depends:      mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string
+    build-depends:      mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string
 
     if true
         ghc-options:    -fwarn-tabs -Wall
diff -u xmonad-contrib-0.10/XMonad/Layout/Spiral.hs\~ xmonad-contrib-0.10/XMonad/Layout/Spiral.hs
--- xmonad-contrib-0.10/XMonad/Layout/Spiral.hs~	2011-11-19 08:26:06.000000000 +0900
+++ xmonad-contrib-0.10/XMonad/Layout/Spiral.hs	2012-06-11 11:31:00.123639743 +0900
@@ -26,7 +26,7 @@
                             ) where
 
 import Data.Ratio
-import XMonad
+import XMonad hiding ( Rotation )
 import XMonad.StackSet ( integrate )
 
 -- $usage
--- xmonad-contrib-0.10/XMonad/Util/Paste.hs~	2011-11-19 08:26:06.000000000 +0900
+++ xmonad-contrib-0.10/XMonad/Util/Paste.hs	2012-06-11 11:49:14.253451338 +0900
@@ -89,9 +89,3 @@
                   sendEvent d w True keyPressMask ev
                   setEventType ev keyRelease
                   sendEvent d w True keyReleaseMask ev
-
--- | A null 'KeyMask'. Used when you don't want a character or string shifted, control'd, or what.
---
---   TODO: This really should be a function in the X11 binding. When noModMask shows up there, remove.
-noModMask :: KeyMask
-noModMask = 0