diff --git a/CHANGELOG.org b/CHANGELOG.org
index e6c2eeb..a8c41d9 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -35,6 +35,12 @@ This project adheres to [[http://semver.org][Semantic Versioning]].
 
 ** ADDED =highlight-numbers-number= face
 
+** FIXED Make markdown header faces work without loading Org
+
+   Stop making the =markdown-header-face-*= faces inherit from the
+   equivalent =org-level-*= faces, this kept the markdown faces from
+   working if Org mode wasn't loaded.
+
 * [[https://github.com/ryuslash/yoshi-theme/compare/v5.13.0...v6.0.0][6.0.0]] -- 2015-08-31
   :PROPERTIES:
   :CUSTOM_ID: release-6.0.0
diff --git a/yoshi-theme.el b/yoshi-theme.el
index 86c9966..c7f557e 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -309,12 +309,12 @@
    `(makefile-space ((t (:background ,bgpink))))
 
    ;;; Markdown
-   `(markdown-header-face-1 ((t (:inherit org-level-1))))
-   `(markdown-header-face-2 ((t (:inherit org-level-2))))
-   `(markdown-header-face-3 ((t (:inherit org-level-3))))
-   `(markdown-header-face-4 ((t (:inherit org-level-4))))
-   `(markdown-header-face-5 ((t (:inherit org-level-5))))
-   `(markdown-header-face-6 ((t (:inherit org-level-6))))
+   `(markdown-header-face-1 ((t (:foreground ,fggreen :inherit unspecified))))
+   `(markdown-header-face-2 ((t (:foreground ,fgcyan :inherit unspecified))))
+   `(markdown-header-face-3 ((t (:foreground ,fgred :inherit unspecified))))
+   `(markdown-header-face-4 ((t (:foreground ,fgblue :inherit unspecified))))
+   `(markdown-header-face-5 ((t (:foreground ,fgyellow :inherit unspecified))))
+   `(markdown-header-face-6 ((t (:foreground ,fgpurple :inherit unspecified))))
 
    ;;; Message mode
    `(message-header-cc ((t (:foreground ,fgdim))))