diff --git a/shinmera-markless.el b/shinmera-markless.el
new file mode 100644
index 0000000..c372544
--- /dev/null
+++ b/shinmera-markless.el
@@ -0,0 +1,10 @@
+(require 'shinmera-package)
+
+(when (featurep 'shinmera-package)
+  (ensure-installed 'markless))
+
+(autoload 'markless-mode "markless" "" t nil)
+(add-to-list 'auto-mode-alist '("\\.mess\\'" . markless-mode))
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "markless" '("markless-")))
+
+(provide 'shinmera-markless)
diff --git a/shinmera.el b/shinmera.el
index 0aac9a8..83a34fe 100644
--- a/shinmera.el
+++ b/shinmera.el
@@ -28,5 +28,6 @@
 (require 'shinmera-js)
 (require 'shinmera-c)
 (require 'shinmera-java)
+(require 'shinmera-markless)
 ;; Last
 (require 'shinmera-startup)