diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+- 0.8.5.0
+    * Support disabling in compiled heist
diff --git a/digestive-functors-heist.cabal b/digestive-functors-heist.cabal
--- a/digestive-functors-heist.cabal
+++ b/digestive-functors-heist.cabal
@@ -1,5 +1,5 @@
 Name:          digestive-functors-heist
-Version:       0.8.4.1
+Version:       0.8.5.0
 Synopsis:      Heist frontend for the digestive-functors library
 Description:   Heist frontend for the digestive-functors library
 Homepage:      http://github.com/jaspervdj/digestive-functors
@@ -10,6 +10,9 @@
 Category:      Web
 Build-type:    Simple
 Cabal-version: >= 1.6
+
+Extra-source-files:
+  CHANGELOG
 
 Library
   Hs-source-dirs:  src
diff --git a/src/Text/Digestive/Heist/Compiled.hs b/src/Text/Digestive/Heist/Compiled.hs
--- a/src/Text/Digestive/Heist/Compiled.hs
+++ b/src/Text/Digestive/Heist/Compiled.hs
@@ -152,6 +152,12 @@
 
 
 --------------------------------------------------------------------------------
+-- |
+setDisabled :: Text -> View v -> [(Text, Text)] -> [(Text, Text)]
+setDisabled ref view = if viewDisabled ref view then (("disabled",""):) else id
+
+
+--------------------------------------------------------------------------------
 getRefAttributes :: X.Node
                  -> Maybe Text              -- ^ Optional default ref
                  -> (Text, [(Text, Text)])  -- ^ (Ref, other attrs)
@@ -195,7 +201,8 @@
         -- If there is no bang pattern on value, then for some reason it
         -- doesn't get forced and errors aren't displayed properly.
         !value = fieldInputText ref view
-    return $ X.renderHtmlFragment X.UTF8 $ f ref' attrs value
+        attrs' = setDisabled ref view attrs
+    return $ X.renderHtmlFragment X.UTF8 $ f ref' attrs' value
 
 
 dfInputGeneric :: Monad m
