diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47eca827..f986d44a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## Unreleased
+
+ * added autocreation of constants for each state ([@jherdman](https://github.com/jherdman))
+
 ## 3.0.16
 
  * added autocreation of state scopes for Mongoid (thanks to [@jonnyshields](https://github.com/johnnyshields))
diff --git a/lib/aasm/base.rb b/lib/aasm/base.rb
index 770f418f..2606f3fb 100644
--- a/lib/aasm/base.rb
+++ b/lib/aasm/base.rb
@@ -32,6 +32,10 @@ def state(name, options={})
       @clazz.send(:define_method, "#{name.to_s}?") do
         aasm_current_state == name
       end
+
+      unless @clazz.const_defined?("STATE_#{name.to_s.upcase}")
+        @clazz.const_set("STATE_#{name.to_s.upcase}", name)
+      end
     end
 
     # define an event
diff --git a/spec/unit/simple_example_spec.rb b/spec/unit/simple_example_spec.rb
index 6265a721..b7a5c612 100644
--- a/spec/unit/simple_example_spec.rb
+++ b/spec/unit/simple_example_spec.rb
@@ -50,4 +50,10 @@ class Payment
     lambda {payment.fill_out}.should raise_error(AASM::InvalidTransition)
     lambda {payment.fill_out!}.should raise_error(AASM::InvalidTransition)
   end
+
+  it 'defines constants for each state name' do
+    Payment::STATE_INITIALISED.should eq(:initialised)
+    Payment::STATE_FILLED_OUT.should eq(:filled_out)
+    Payment::STATE_AUTHORISED.should eq(:authorised)
+  end
 end