diff --git a/.gitignore b/.gitignore
index dc24846..72fe99b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ src/highlight.js
 src/style.css
 *.tags
 TAGS
+pinboard.cabal
diff --git a/package.yaml b/package.yaml
new file mode 100644
index 0000000..8856d16
--- /dev/null
+++ b/package.yaml
@@ -0,0 +1,80 @@
+name: pinboard
+version: '0.9.12'
+synopsis: Access to the Pinboard API
+description: ! '
+
+  The Pinboard API is a way to interact programatically with
+
+  your bookmarks, notes and other Pinboard data. This
+
+  library wraps the API exposing functions and data
+
+  structures suitable for usage in Haskell programs.
+
+'
+category: Network APIs
+author: Jon Schoning
+maintainer: jonschoning@gmail.com
+copyright: Copyright (c) 2015 Jon Schoning
+license: MIT
+homepage: https://github.com/jonschoning/pinboard
+git: git://github.com/jonschoning/pinboard.git
+bug-reports: https://github.com/jonschoning/pinboard/issues
+extra-source-files:
+- README.md
+- changelog.md
+ghc-options: -Wall
+dependencies:
+- base >=4.6 && <5.0
+- transformers >=0.4.0.0
+- mtl >=2.2.1
+- safe-exceptions <0.2
+- unordered-containers
+library:
+  source-dirs: src
+  ghc-options:
+  - -fwarn-incomplete-patterns
+  - -funbox-strict-fields
+  - -fexpose-all-unfoldings
+  exposed-modules:
+  - Pinboard
+  - Pinboard.Api
+  - Pinboard.ApiRequest
+  - Pinboard.ApiTypes
+  - Pinboard.ApiTypesLens
+  - Pinboard.Client
+  - Pinboard.Error
+  - Pinboard.Types
+  - Pinboard.Util
+  - Pinboard.Logging
+  dependencies:
+  - aeson >=0.11.1 && <2.0
+  - bytestring >=0.10.0 && <0.11
+  - containers >=0.5.0.0 && <0.6
+  - http-types >=0.8 && <0.10
+  - http-client >=0.5 && <0.6
+  - http-client-tls >=0.3.0 && <0.4
+  - text >=0.11 && <1.3
+  - time >=1.5 && <1.7
+  - vector >=0.10.9 && <0.12
+  - network >=2.6.2 && <2.7
+  - profunctors >=5
+  - random >=1.1
+  - monad-logger >=0.3 && <0.4
+tests:
+  tests:
+    main: Test.hs
+    source-dirs: tests
+    ghc-options:
+    - -fno-warn-orphans
+    - -fno-warn-orphans
+    dependencies:
+    - pinboard
+    - bytestring
+    - containers
+    - hspec >=1.8
+    - text
+    - time
+    - aeson
+    - semigroups
+    - QuickCheck
diff --git a/pinboard.cabal b/pinboard.cabal
deleted file mode 100644
index dc5896d..0000000
--- a/pinboard.cabal
+++ /dev/null
@@ -1,91 +0,0 @@
-name:                pinboard
-version:             0.9.12
-synopsis:            Access to the Pinboard API
-license:             MIT
-license-file:        LICENSE
-author:              Jon Schoning
-maintainer:          jonschoning@gmail.com
-copyright:           Copyright (c) 2015 Jon Schoning
-homepage:            https://github.com/jonschoning/pinboard
-bug-reports:         https://github.com/jonschoning/pinboard/issues
-category:            Network APIs
-build-type:          Simple
-cabal-version:       >=1.10
-Description:         
-    .
-    The Pinboard API is a way to interact programatically with
-    your bookmarks, notes and other Pinboard data. This
-    library wraps the API exposing functions and data
-    structures suitable for usage in Haskell programs.
-    .
-Extra-Source-Files:
-        README.md changelog.md
-library 
-  hs-source-dirs:      src
-  build-depends:       base >=4.6 && < 5.0
-                     , aeson >= 0.11.1  && < 2.0
-                     , bytestring >= 0.10.0  && <0.11 
-                     , containers >= 0.5.0.0 && <0.6 
-                     , http-types >= 0.8 && <0.10
-                     , http-client >= 0.5 && <0.6 
-                     , http-client-tls >= 0.3.0 && < 0.4
-                     , text >= 0.11 && < 1.3
-                     , time >= 1.5 && < 1.7
-                     , transformers >= 0.4.0.0
-                     , vector >= 0.10.9  && < 0.12
-                     , network >= 2.6.2 && < 2.7
-                     , mtl >= 2.2.1
-                     , profunctors >= 5
-                     , random >= 1.1
-                     , safe-exceptions < 0.2
-                     , unordered-containers
-                     , monad-logger >= 0.3 && < 0.4
-
-              
-  default-language:    Haskell2010
-  other-modules:     
-  exposed-modules:     
-                       Pinboard
-                       Pinboard.Api
-                       Pinboard.ApiRequest
-                       Pinboard.ApiTypes 
-                       Pinboard.ApiTypesLens  
-                       Pinboard.Client
-                       Pinboard.Error
-                       Pinboard.Types
-                       Pinboard.Util
-                       Pinboard.Logging
-  ghc-options:         -Wall
-                       -fwarn-incomplete-patterns
-                       -funbox-strict-fields
-                       -fexpose-all-unfoldings
-test-suite tests
-  ghc-options: -Wall -fno-warn-orphans
-  type: exitcode-stdio-1.0
-  main-is: Test.hs
-  hs-source-dirs: tests
-  other-modules:     
-                       ApproxEq
-                       Instances
-                       PropJSON
-  build-depends:       base >=4.6 && < 5.0,
-                       pinboard,
-                       bytestring,
-                       containers,
-                       hspec                >= 1.8 ,
-                       text,
-                       time,
-                       aeson,
-                       semigroups,
-                       QuickCheck,
-                       mtl >= 2.2.1,
-                       safe-exceptions < 0.2,
-                       unordered-containers,
-                       transformers >= 0.4.0.0
-  ghc-options:         -Wall 
-                       -fno-warn-orphans
-  default-language:    Haskell2010
-
-source-repository head
-  type:     git
-  location: git://github.com/jonschoning/pinboard.git