diff --git a/ChangeLog.md b/ChangeLog.md
new file mode 100644
--- /dev/null
+++ b/ChangeLog.md
@@ -0,0 +1,5 @@
+# Changelog for compdoc-dhall-decoder
+
+## v0.1.0.0
+
+* Working compdoc decoder for dhall.
diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,30 @@
+Copyright Daniel Firth (c) 2020
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Daniel Firth nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,14 @@
+# compdoc-dhall-decoder
+
+This module allows you to decode a `Compdoc` value from markdown.
+
+You should use newtypes like so:
+
+```
+newtype MyDoc = MyDoc (Record (Compdoc '[]))
+  deriving stock (Eq, Show, Generic)
+
+
+instance D.FromDhall MyDoc where
+  autoWith options = fmap MyDoc $ compdocDecoder def (recordJsonFormat RNil) options
+```
diff --git a/compdoc-dhall-decoder.cabal b/compdoc-dhall-decoder.cabal
new file mode 100644
--- /dev/null
+++ b/compdoc-dhall-decoder.cabal
@@ -0,0 +1,41 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.34.2.
+--
+-- see: https://github.com/sol/hpack
+
+name:           compdoc-dhall-decoder
+version:        0.1.0.0
+synopsis:       Allows you to write FromDhall instances for Compdoc
+category:       dhall pandoc
+author:         Daniel Firth
+maintainer:     dan.firth@homotopic.tech
+copyright:      dan.firth@homotopic.tech
+license:        BSD3
+license-file:   LICENSE
+build-type:     Simple
+extra-source-files:
+    README.md
+    ChangeLog.md
+
+source-repository head
+  type: git
+  location: https://gitlab.com/homotopic-tech/compdoc-dhall-decoder
+
+library
+  exposed-modules:
+      Text.Compdoc.Dhall
+  other-modules:
+      Paths_compdoc_dhall_decoder
+  hs-source-dirs:
+      src
+  build-depends:
+      base >=4.7 && <5
+    , compdoc
+    , composite-aeson
+    , composite-base
+    , dhall
+    , either
+    , pandoc
+    , text
+  default-language: Haskell2010
diff --git a/src/Text/Compdoc/Dhall.hs b/src/Text/Compdoc/Dhall.hs
new file mode 100644
--- /dev/null
+++ b/src/Text/Compdoc/Dhall.hs
@@ -0,0 +1,30 @@
+module Text.Compdoc.Dhall where
+
+import Composite.Aeson
+import Composite.Record
+import Data.Either.Validation
+import Data.Void
+import qualified Dhall as D
+import Data.Text as T
+import Text.Compdoc
+import Data.Typeable
+import Text.Pandoc
+
+-- | Decode a Compdoc value.
+compdocDecoder :: WriterOptions -> JsonFormat Void (Record a) -> D.InputNormalizer -> D.Decoder (Record (Compdoc a))
+compdocDecoder wopts f opts =
+      D.Decoder
+            { D.extract = extractDoc
+            , D.expected = expectedDoc
+            }
+      where
+        docDecoder :: D.Decoder Text
+        docDecoder = D.autoWith opts
+
+        extractDoc expression =
+          case D.extract docDecoder expression of
+              Success x -> case readMarkdown' def { readerExtensions = pandocExtensions } wopts f x of
+                Left exception   -> D.extractError (T.pack $ show exception)
+                Right path       -> Success path
+              Failure e        -> Failure e
+        expectedDoc = D.expected docDecoder