diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,57 @@
+hsimport
+========
+
+A command line program for extending the import list of a Haskell source file.
+
+`hsimport` gets the module name and the symbol name to import as arguments,
+parses the given source file by using the library `haskell-src-exts` and than
+tries to only extend the import list if it's necessary. If the symbol is already
+imported or if the whole module is already imported, than the given source file
+isn't changed.
+
+Installation
+------------
+
+    cabal install hsimport
+
+Examples
+--------
+
+    $ hsimport -m 'Control.Monad' SomeSource.hs`
+    => import Control.Monad
+
+    $ hsimport -m 'Control.Monad' -s 'when' SomeSource.hs
+    => import Control.Monad (when)
+
+    $ hsimport -m 'Control.Monad' -q 'CM' SomeSource.hs
+    => import qualified Control.Monad as CM
+
+Text Editor Integration
+-----------------------
+
+[vim-hsimport](<https://github.com/dan-t/vim-hsimport>)
+
+Command Line Usage
+------------------
+
+    dan@machine ~> hsimport --help
+    hsimport [OPTIONS] [SOURCEFILE]
+      A command line program for extending the import list of a Haskell source
+      file.
+    
+    Common flags:
+      -m --modulename=ITEM     The module to import
+      -s --symbolname=ITEM     The symbol to import, if empty, the entire module
+                               is imported
+      -q --qualifiedname=ITEM  The name to use for a qualified module import
+      -o --outputsrcfile=FILE  Save modified source file to file, if empty, the
+                               source file is modified inplace
+      -h --help                Display help message
+      -v --version             Print version information
+
+Issues
+------
+
+There is some rudimentarily handling for code using CPP, but the import statements
+might be added at the wrong place, because the lines containing CPP directives
+are ignored and therefore they aren't considered in the source line count.
diff --git a/hsimport.cabal b/hsimport.cabal
--- a/hsimport.cabal
+++ b/hsimport.cabal
@@ -1,5 +1,5 @@
 Name:          hsimport
-Version:       0.2.6.7
+Version:       0.2.6.8
 License:       BSD3
 License-file:  LICENSE
 Author:        Daniel Trstenjak
@@ -10,12 +10,12 @@
 Synopsis:      A command line program for extending the import list of a Haskell source file.
 Description:   A command line program for extending the import list of a Haskell source file.
 
--- test samples
 extra-source-files:
-    tests/inputFiles/*.hs
-    tests/goldenFiles/*.hs
-    -- to leave directory in tarball
-    tests/outputFiles/.gitignore
+  README.md
+  tests/inputFiles/*.hs
+  tests/goldenFiles/*.hs
+  -- to leave directory in tarball
+  tests/outputFiles/.gitignore
 
 source-repository head
   type:     git