diff --git a/x11/xmonad/Makefile b/x11/xmonad/Makefile
index a0744789268..a828968e9b4 100644
--- a/x11/xmonad/Makefile
+++ b/x11/xmonad/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2008/02/03 18:17:51 kili Exp $
+# $OpenBSD: Makefile,v 1.8 2008/04/16 21:00:56 kili Exp $
 
 COMMENT-main=		tiling window manager
 COMMENT-lib=		libraries for runtime configuration
 
-V=			0.6
+V=			0.7
 DISTNAME=		xmonad-$V
 PKGNAME-main=		xmonad-$V
 PKGNAME-lib=		xmonad-lib-$V
diff --git a/x11/xmonad/distinfo b/x11/xmonad/distinfo
index dc2e6042678..3f52e854566 100644
--- a/x11/xmonad/distinfo
+++ b/x11/xmonad/distinfo
@@ -1,5 +1,5 @@
-MD5 (xmonad-0.6.tar.gz) = XkMdXhPPtcvN4vWj+BN5ag==
-RMD160 (xmonad-0.6.tar.gz) = U1E/zu3Xl56i2/qILnN6Dd2bvoA=
-SHA1 (xmonad-0.6.tar.gz) = 4iIbgOA80Jl8uEHoWsiT1tr237A=
-SHA256 (xmonad-0.6.tar.gz) = 4QfF28ZZsjQuDnNtm67g7oihQE+lFhSBsZJPI9M2fCE=
-SIZE (xmonad-0.6.tar.gz) = 49635
+MD5 (xmonad-0.7.tar.gz) = +eJfMQy6FdlunfStl+FWuA==
+RMD160 (xmonad-0.7.tar.gz) = eQ+M56OXX8OFomdwajwZ/ewfPDI=
+SHA1 (xmonad-0.7.tar.gz) = zz+3ZiySytuep7/ckWu+XMWHrIY=
+SHA256 (xmonad-0.7.tar.gz) = 1e4zjrbQaACC4g6q+gsjsyNY//5p4uxK17324Dx1HWc=
+SIZE (xmonad-0.7.tar.gz) = 52740
diff --git a/x11/xmonad/patches/patch-XMonad_Operations_hs b/x11/xmonad/patches/patch-XMonad_Operations_hs
index c1d4143e766..3c314fdf06d 100644
--- a/x11/xmonad/patches/patch-XMonad_Operations_hs
+++ b/x11/xmonad/patches/patch-XMonad_Operations_hs
@@ -1,10 +1,10 @@
-$OpenBSD: patch-XMonad_Operations_hs,v 1.2 2008/02/03 18:17:51 kili Exp $
+$OpenBSD: patch-XMonad_Operations_hs,v 1.3 2008/04/16 21:00:56 kili Exp $
 
 Backport for ghc-6.6 and X11-extras.
 
---- XMonad/Operations.hs.orig	Sun Jan 27 23:02:10 2008
-+++ XMonad/Operations.hs	Mon Jan 28 20:37:49 2008
-@@ -170,7 +170,7 @@ windows f = do
+--- XMonad/Operations.hs.orig	Sat Mar 29 21:59:44 2008
++++ XMonad/Operations.hs	Mon Mar 31 23:05:12 2008
+@@ -172,7 +172,7 @@ windows f = do
      -- all windows that are no longer in the windowset are marked as
      -- withdrawn, it is important to do this after the above, otherwise 'hide'
      -- will overwrite withdrawnState with iconicState
@@ -13,7 +13,7 @@ Backport for ghc-6.6 and X11-extras.
  
      clearEvents enterWindowMask
  
-@@ -186,7 +186,7 @@ hide w = whenX (gets (S.member w . mapped)) $ withDisp
+@@ -188,7 +188,7 @@ hide w = whenX (gets (S.member w . mapped)) $ withDisp
      io $ do selectInput d w (clientMask .&. complement structureNotifyMask)
              unmapWindow d w
              selectInput d w clientMask
@@ -22,7 +22,7 @@ Backport for ghc-6.6 and X11-extras.
      -- this part is key: we increment the waitingUnmap counter to distinguish
      -- between client and xmonad initiated unmaps.
      modify (\s -> s { waitingUnmap = M.insertWith (+) w 1 (waitingUnmap s)
-@@ -196,7 +196,7 @@ hide w = whenX (gets (S.member w . mapped)) $ withDisp
+@@ -198,7 +198,7 @@ hide w = whenX (gets (S.member w . mapped)) $ withDisp
  -- this is harmless if the window was already visible
  reveal :: Window -> X ()
  reveal w = withDisplay $ \d -> do
@@ -31,7 +31,7 @@ Backport for ghc-6.6 and X11-extras.
      io $ mapWindow d w
      modify (\s -> s { mapped = S.insert w (mapped s) })
  
-@@ -207,7 +207,7 @@ clientMask = structureNotifyMask .|. enterWindowMask .
+@@ -209,7 +209,7 @@ clientMask = structureNotifyMask .|. enterWindowMask .
  -- | Set some properties when we initially gain control of a window
  setInitialProperties :: Window -> X ()
  setInitialProperties w = asks normalBorder >>= \nb -> withDisplay $ \d -> do
diff --git a/x11/xmonad/patches/patch-xmonad_cabal b/x11/xmonad/patches/patch-xmonad_cabal
index 963a1a9296c..eaa019af0bd 100644
--- a/x11/xmonad/patches/patch-xmonad_cabal
+++ b/x11/xmonad/patches/patch-xmonad_cabal
@@ -1,11 +1,12 @@
-$OpenBSD: patch-xmonad_cabal,v 1.2 2008/02/03 18:17:51 kili Exp $
---- xmonad.cabal.orig	Sun Jan 27 23:02:11 2008
-+++ xmonad.cabal	Mon Jan 28 20:39:03 2008
-@@ -20,57 +20,29 @@ maintainer:         xmonad@haskell.org
+$OpenBSD: patch-xmonad_cabal,v 1.3 2008/04/16 21:00:56 kili Exp $
+--- xmonad.cabal.orig	Sat Mar 29 21:59:44 2008
++++ xmonad.cabal	Mon Mar 31 23:12:04 2008
+@@ -20,58 +20,29 @@ maintainer:         xmonad@haskell.org
  extra-source-files: README TODO CONFIG STYLE tests/loc.hs tests/Properties.hs
                      man/xmonad.1.in man/xmonad.1 man/xmonad.html man/xmonad.hs
                      util/GenerateManpage.hs
 -cabal-version:      >= 1.2
+-build-type:         Simple
 +build-depends: base < 3, X11>=1.2.1, X11-extras>=0.4, mtl, unix
 +exposed-modules:    XMonad
 +                    XMonad.Main