diff --git a/IHaskell/Display/Diagrams.hs b/IHaskell/Display/Diagrams.hs
new file mode 100644
--- /dev/null
+++ b/IHaskell/Display/Diagrams.hs
@@ -0,0 +1,51 @@
+{-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, FlexibleInstances  #-}
+module IHaskell.Display.Diagrams (diagram) where
+
+import ClassyPrelude
+
+import System.Directory
+import qualified Data.ByteString.Char8 as Char
+import System.IO.Unsafe
+
+import Diagrams.Prelude
+import Diagrams.Backend.Cairo
+
+import IHaskell.Display
+
+instance IHaskellDisplay (Diagram Cairo R2) where
+  display renderable = do
+    png <- diagramData renderable PNG
+    svg <- diagramData renderable SVG
+    return $ Display [png, svg]
+
+diagramData :: Diagram Cairo R2 -> OutputType -> IO DisplayData
+diagramData renderable format = do
+  -- Switch to a temporary directory so that any files we create aren't
+  -- visible. On Unix, this is usually /tmp.
+  try (getTemporaryDirectory >>= setCurrentDirectory) :: IO (Either SomeException ())
+
+  -- Compute width and height.
+  let w = width renderable
+      h = height renderable
+      aspect = w / h
+      imgHeight = 300
+      imgWidth = aspect * imgHeight
+
+  -- Write the image.
+  let filename = ".ihaskell-diagram." ++ extension format
+  renderCairo filename (Height imgHeight) renderable
+
+  -- Convert to base64.
+  imgData <- readFile $ fpFromString filename
+  let value = case format of
+        PNG -> png (floor imgWidth) (floor imgHeight) $ base64 imgData
+        SVG -> svg $ Char.unpack imgData
+
+  return value
+  where
+    extension SVG = "svg"
+    extension PNG = "png"
+
+-- Rendering hint.
+diagram :: Diagram Cairo R2 -> Diagram Cairo R2
+diagram = id
diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Andrew Gibiansky
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/ihaskell-diagrams.cabal b/ihaskell-diagrams.cabal
new file mode 100644
--- /dev/null
+++ b/ihaskell-diagrams.cabal
@@ -0,0 +1,74 @@
+-- The name of the package.
+name:                ihaskell-diagrams
+
+-- The package version.  See the Haskell package versioning policy (PVP) 
+-- for standards guiding when and how versions should be incremented.
+-- http://www.haskell.org/haskellwiki/Package_versioning_policy
+-- PVP summary:      +-+------- breaking API changes
+--                   | | +----- non-breaking API additions
+--                   | | | +--- code changes with no API change
+version:             0.1.0.0
+
+-- A short (one-line) description of the package.
+synopsis:            IHaskell display instances for diagram types
+
+-- A longer description of the package.
+-- description:         
+
+-- URL for the project homepage or repository.
+homepage:            http://www.github.com/gibiansky/ihaskell
+
+-- The license under which the package is released.
+license:             MIT
+
+-- The file containing the license text.
+license-file:        LICENSE
+
+-- The package author(s).
+author:              Andrew Gibiansky
+
+-- An email address to which users can send suggestions, bug reports, and 
+-- patches.
+maintainer:          andrew.gibiansky@gmail.com
+
+-- A copyright notice.
+-- copyright:           
+
+category:            Development
+
+build-type:          Simple
+
+-- Extra files to be distributed with the package, such as examples or a 
+-- README.
+-- extra-source-files:  
+
+-- Constraint on the version of Cabal needed to build this package.
+cabal-version:       >=1.16
+
+
+library
+  -- Modules exported by the library.
+  exposed-modules:     IHaskell.Display.Diagrams
+  
+  -- Modules included in this library but not exported.
+  -- other-modules:       
+  
+  -- Language extensions.
+  default-extensions: DoAndIfThenElse
+              OverloadedStrings
+             
+  -- Other library packages from which modules are imported.
+  build-depends:       base ==4.6.*,
+                       classy-prelude >=0.6,
+                       bytestring,
+                       directory,
+                       diagrams,
+                       diagrams-lib, 
+                       diagrams-cairo,
+                       ihaskell >= 0.3
+  
+  -- Directories containing source files.
+  -- hs-source-dirs:      
+  
+  -- Base language which the package is written in.
+  default-language:    Haskell2010