diff --git a/Makefile b/Makefile
index c2cf996..1ea1e6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+# TODO: Phase out Makefile in favor of Cabal
+
 GHCFLAGS=-O9
 
 all: shellcheck jsoncheck .tests
diff --git a/README b/README
index db7e166..8814be2 100644
--- a/README
+++ b/README
@@ -15,13 +15,12 @@ The goals of ShellCheck are:
   - To point out subtle caveats, corner cases and pitfalls, that may cause an
     advanced user's otherwise working script to fail under future circumstances.
 
-
 ShellCheck is written in Haskell, and requires GHC, Parsec3 and Text.Regex. 
 To build the JSON interface and run the unit tests, it also requires QuickCheck2 and JSON.
 
 On Ubuntu and similar, these are called:
   ghc6 libghc6-parsec3-dev libghc6-quickcheck2-dev libghc6-json-dev libghc-regex-compat-dev
 
-Build with 'make'. 
+Executables can be built with cabal. Tests currently still rely on a Makefile.
 
 Happy ShellChecking!
diff --git a/ShellCheck.cabal b/ShellCheck.cabal
new file mode 100644
index 0000000..532b132
--- /dev/null
+++ b/ShellCheck.cabal
@@ -0,0 +1,20 @@
+Name:             ShellCheck
+Version:          0.0.0
+Description:      Shell script analysis tool
+License-file:     LICENSE
+Author:           Vidar Holen
+Maintainer:       vidar@vidarholen.net
+Homepage:         http://www.shellcheck.net/
+Build-Type:       Simple
+Cabal-Version:    >= 1.2
+
+library
+    build-depends: base >= 4, parsec, containers, regex-compat, mtl, directory
+    exposed-modules: ShellCheck.AST, ShellCheck.Parser, ShellCheck.Analytics, ShellCheck.Simple
+
+executable shellcheck
+    main-is: shellcheck.hs
+
+executable jsoncheck
+    build-depends: json
+    main-is: jsoncheck.hs