diff --git a/_tools/typemill.md b/_tools/typemill.md
new file mode 100644
index 00000000..3f6f3809
--- /dev/null
+++ b/_tools/typemill.md
@@ -0,0 +1,74 @@
+---
+title: Typemill
+category: "websites"
+description: "Typemill is an open source CMS for websites and ebooks in pdf- and epub-format."
+icon: typemill.png
+website: https://typemill.net
+syntax:
+  - id: headings
+    available: y
+  - id: paragraphs
+    available: y
+  - id: line-breaks
+    available: y
+  - id: bold
+    available: y
+  - id: italic
+    available: y
+  - id: blockquotes
+    available: y
+  - id: ordered-lists
+    available: y
+  - id: unordered-lists
+    available: y
+  - id: code
+    available: y
+  - id: horizontal-rules
+    available: y
+  - id: links
+    available: y
+  - id: images
+    available: y
+  - id: tables
+    available: y
+  - id: fenced-code-blocks
+    available: y
+  - id: syntax-highlighting
+    available: p
+    notes: "Syntax highlighting available in the raw markdown editor and in frontend with a plugin possible."    
+  - id: footnotes
+    available: y
+  - id: heading-ids
+    available: yes
+    notes: "Can be activated in the settings."
+  - id: definition-lists
+    available: y
+  - id: strikethrough
+    available: n
+  - id: task-lists
+    available: n
+  - id: emoji-cp
+    available: n
+  - id: emoji-sc
+    available: n
+  - id: highlight
+    available: n
+  - id: subscript
+    available: n
+  - id: superscript
+    available: y
+  - id: auto-url-linking
+    available: y
+  - id: disabling-auto-url
+    available: n
+  - id: html
+    available: p
+    notes: "HTML is off by default for security reasons but you can use various html-tags with a plugin that utilizes the shortcode feature."
+---
+[Typemill](https://typemill.net) is a lightweight content management system (CMS) for creating websites and ebooks in PDF and ePub formats. Typemill is especially popular among small and mid-sized companies for creating documentation and manuals for software, physical products, and services.
+
+{% include image.html file="/assets/images/tools/typemill.gif" alt="Typemill markdown editor" %}
+
+Typemill is built with Vue.js and PHP. It uses the widely adopted Parsedown library for Markdown conversion.
+
+{% include tool-syntax-table.html %}
diff --git a/assets/images/tool-icons/typemill.png b/assets/images/tool-icons/typemill.png
new file mode 100644
index 00000000..745a12d9
Binary files /dev/null and b/assets/images/tool-icons/typemill.png differ
diff --git a/assets/images/tools/typemill.gif b/assets/images/tools/typemill.gif
new file mode 100644
index 00000000..61798190
Binary files /dev/null and b/assets/images/tools/typemill.gif differ