diff --git a/CHANGES.markdown b/CHANGES.markdown
--- a/CHANGES.markdown
+++ b/CHANGES.markdown
@@ -1,3 +1,8 @@
+0.6.0.3: 27 January 2013
+------------------------
+
+* Switch to explicit import list for Control.Lens to avoid name conflicts
+
 0.6.0.2: 24 January 2013
 ------------------------
 
diff --git a/diagrams-contrib.cabal b/diagrams-contrib.cabal
--- a/diagrams-contrib.cabal
+++ b/diagrams-contrib.cabal
@@ -1,5 +1,5 @@
 name:                diagrams-contrib
-version:             0.6.0.2
+version:             0.6.0.3
 synopsis:            Collection of user contributions to diagrams EDSL
 description:         A collection of user contributions for diagrams,
                      an embedded domain-specific language for generation 
diff --git a/src/Diagrams/TwoD/Layout/Tree.hs b/src/Diagrams/TwoD/Layout/Tree.hs
--- a/src/Diagrams/TwoD/Layout/Tree.hs
+++ b/src/Diagrams/TwoD/Layout/Tree.hs
@@ -109,7 +109,7 @@
 
 import           Control.Applicative
 import           Control.Arrow         (first, second, (***), (&&&))
-import           Control.Lens          hiding (moveTo)
+import           Control.Lens          (makeLenses, (+=), (-=), view, (^.))
 import           Control.Monad.State
 
 import           Data.Default