diff --git a/Graphics/Rendering/OpenGL/Raw/Core21.hs b/Graphics/Rendering/OpenGL/Raw/Core21.hs
--- a/Graphics/Rendering/OpenGL/Raw/Core21.hs
+++ b/Graphics/Rendering/OpenGL/Raw/Core21.hs
@@ -621,4 +621,5 @@
        , GLushort
        ) where       
 
-import Graphics.Rendering.OpenGL.Raw.Core31
+import Graphics.Rendering.OpenGL.Raw.Core30
+import Graphics.Rendering.OpenGL.Raw.Tokens
diff --git a/OpenGLRaw21.cabal b/OpenGLRaw21.cabal
--- a/OpenGLRaw21.cabal
+++ b/OpenGLRaw21.cabal
@@ -1,5 +1,5 @@
 Name:                OpenGLRaw21
-Version:             1.2.0.1
+Version:             2.0.0.0
 Synopsis:            The intersection of OpenGL 2.1 and OpenGL 3.1 Core
 Description:         This package simply reexports a subset of the
                      parts of OpenGLRaw which are compatible with
@@ -15,14 +15,16 @@
 Maintainer:          Jake McArthur <Jake.McArthur@gmail.com>
 Category:            Graphics
 Build-type:          Simple
-Cabal-version:       >=1.6
+Cabal-version:       >=1.18
 
 Library
-  Build-depends:     OpenGLRaw == 1.1.* || == 1.2.*
-  Extensions:        NoImplicitPrelude
+  Build-depends:     OpenGLRaw >= 2.0 && < 3
+  Default-language:  Haskell2010
   Exposed-modules:   Graphics.Rendering.OpenGL.Raw.Core21
   GHC-options:       -Wall -fwarn-tabs
+  Other-extensions:  NoImplicitPrelude
 
 Source-repository head
   type:     darcs
   location: http://patch-tag.com/r/jmcarthur/OpenGLRaw21
+  tag:      v2.0.0.0