diff --git a/x11/hs-xmonad-contrib/patches/patch-XMonad_Layout_Spiral_hs b/x11/hs-xmonad-contrib/patches/patch-XMonad_Layout_Spiral_hs
new file mode 100644
index 00000000000..e4f839c7a8e
--- /dev/null
+++ b/x11/hs-xmonad-contrib/patches/patch-XMonad_Layout_Spiral_hs
@@ -0,0 +1,15 @@
+$OpenBSD: patch-XMonad_Layout_Spiral_hs,v 1.1 2012/06/19 17:46:25 kili Exp $
+
+Avoid name clashes with X11-1.6. From Arch Linux.
+
+--- XMonad/Layout/Spiral.hs.orig	Sat Nov 19 00:26:06 2011
++++ XMonad/Layout/Spiral.hs	Tue Jun 19 18:51:36 2012
+@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral (
+                             ) where
+ 
+ import Data.Ratio
+-import XMonad
++import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..))
+ import XMonad.StackSet ( integrate )
+ 
+ -- $usage
diff --git a/x11/hs-xmonad-contrib/patches/patch-XMonad_Util_Paste_hs b/x11/hs-xmonad-contrib/patches/patch-XMonad_Util_Paste_hs
new file mode 100644
index 00000000000..00b5953a96d
--- /dev/null
+++ b/x11/hs-xmonad-contrib/patches/patch-XMonad_Util_Paste_hs
@@ -0,0 +1,16 @@
+$OpenBSD: patch-XMonad_Util_Paste_hs,v 1.1 2012/06/19 17:46:25 kili Exp $
+
+Avoid name clashes with X11-1.6. From Arch Linux.
+
+--- XMonad/Util/Paste.hs.orig	Sat Nov 19 00:26:06 2011
++++ XMonad/Util/Paste.hs	Tue Jun 19 18:51:36 2012
+@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage
+                            where
+ 
+ import XMonad (io, theRoot, withDisplay, X ())
+-import Graphics.X11
++import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode)
++import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask)
+ import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent)
+ import Control.Monad.Reader (asks)
+ import XMonad.Operations (withFocused)
diff --git a/x11/hs-xmonad-contrib/patches/patch-xmonad-contrib_cabal b/x11/hs-xmonad-contrib/patches/patch-xmonad-contrib_cabal
new file mode 100644
index 00000000000..566461bf440
--- /dev/null
+++ b/x11/hs-xmonad-contrib/patches/patch-xmonad-contrib_cabal
@@ -0,0 +1,15 @@
+$OpenBSD: patch-xmonad-contrib_cabal,v 1.1 2012/06/19 17:46:25 kili Exp $
+
+Allow building against X11-1.6. From Arch Linux.
+
+--- xmonad-contrib.cabal.orig	Sat Nov 19 00:26:06 2011
++++ xmonad-contrib.cabal	Tue Jun 19 18:51:36 2012
+@@ -61,7 +61,7 @@ library
+         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