diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e3f1c4..0c733bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.0.4
+
+ * bugfix: Subclasses of aasm-enabled classes don't lose settings anymore (thanks to codez)
+
 ## 3.0.3
 
  * bugfix: ActiveRecord scopes are generated when using the new DSL
diff --git a/lib/aasm/version.rb b/lib/aasm/version.rb
index 1e0e2a5..c63e375 100644
--- a/lib/aasm/version.rb
+++ b/lib/aasm/version.rb
@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end