diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+Version 0.10.5.1 released 21 September 2014
+
+  * Added markup help for org mode.  Closes #449.
+
+  * Utils.parsePageType:  Added case for "org".
+
+  * Allow newer versions of dependencies.
+
 Version 0.10.5 released 23 August 2014
 
   * Added github login option (Freiric Barral).
diff --git a/Network/Gitit/Util.hs b/Network/Gitit/Util.hs
--- a/Network/Gitit/Util.hs
+++ b/Network/Gitit/Util.hs
@@ -101,6 +101,7 @@
        "textile"      -> (Textile,False)
        "latex"        -> (LaTeX,False)
        "latex+lhs"    -> (LaTeX,True)
+       "org"          -> (Org,False)
        x              -> error $ "Unknown page type: " ++ x
 
 encUrl :: String -> String
diff --git a/data/markupHelp/Markdown b/data/markupHelp/Markdown
--- a/data/markupHelp/Markdown
+++ b/data/markupHelp/Markdown
@@ -41,6 +41,7 @@
 
 term
 :   definition
+
 orange
 :   orange fruit
 
diff --git a/data/markupHelp/Org b/data/markupHelp/Org
new file mode 100644
--- /dev/null
+++ b/data/markupHelp/Org
@@ -0,0 +1,44 @@
+    * Section heading
+
+    ** Subsection
+
+    Formatting: /italics/, *bold*, super^{script}, sub_{script},
+    +strikeout+. A line break\\
+    can be forced with two backslashes at the end of the line.
+
+    #+BEGIN_QUOTE
+      Indented quotation
+    #+END_QUOTE
+
+    Links: [[http://google.com][external]], [[][Wiki Link]],
+    [[/img/gitit-banner.png]], [[#section-heading][to heading]].
+
+    Indented code block:
+
+    #+BEGIN_EXAMPLE
+        #include <stdbool.h>
+    #+END_EXAMPLE
+
+    Or
+
+    #+BEGIN_SRC haskell
+        let a = 1:a in head a
+    #+END_SRC
+
+    -  bulleted
+    -  list
+
+    --------------
+
+    1. ordered
+    2. list
+
+       1. sublist (indent 4 spaces)
+       2. another
+
+    3. item three
+
+    -  term :: definition
+    -  orange :: orange fruit
+
+For more: [org-mode manual](http://orgmode.org/manual/)
diff --git a/gitit.cabal b/gitit.cabal
--- a/gitit.cabal
+++ b/gitit.cabal
@@ -1,5 +1,5 @@
 name:                gitit
-version:             0.10.5
+version:             0.10.5.1
 Cabal-version:       >= 1.6
 build-type:          Simple
 synopsis:            Wiki using happstack, git or darcs, and pandoc.
@@ -80,7 +80,7 @@
                      data/markupHelp/Markdown, data/markupHelp/Markdown+LHS,
                      data/markupHelp/RST, data/markupHelp/RST+LHS,
                      data/markupHelp/LaTeX, data/markupHelp/LaTeX+LHS,
-                     data/markupHelp/HTML,
+                     data/markupHelp/HTML, data/markupHelp/Org,
                      plugins/CapitalizeEmphasis.hs,
                      plugins/PigLatin.hs,
                      plugins/Dot.hs,
@@ -157,7 +157,7 @@
                      HTTP >= 4000.0 && < 4000.3,
                      HStringTemplate >= 0.6 && < 0.8,
                      old-locale >= 1,
-                     time >= 1.1 && < 1.5,
+                     time >= 1.1 && < 1.6,
                      recaptcha >= 0.1,
                      filestore >= 0.6 && < 0.7,
                      zlib >= 0.5 && < 0.6,
@@ -175,7 +175,7 @@
                      uri >= 0.1 && < 0.2,
                      split,
                      hoauth2 >= 0.4.1 && < 0.5,
-                     http-client >= 0.3.5 && < 0.4,
+                     http-client >= 0.3.5 && < 0.5,
                      http-client-tls >= 0.2.2 && < 0.3,
                      aeson >= 0.7 && < 0.9
   if impl(ghc >= 6.10)