diff --git a/src/constants.js b/src/constants.js
index c30ffc381f..d68daf65b1 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,3 +1,4 @@
+export const COMMENT_TYPE = 8;
 export const EMPTY_OBJ = {};
 export const EMPTY_ARR = [];
 export const IS_NON_DIMENSIONAL =
diff --git a/src/create-element.js b/src/create-element.js
index 892389054a..c9d4b4809f 100644
--- a/src/create-element.js
+++ b/src/create-element.js
@@ -1,5 +1,6 @@
 import { slice } from './util';
 import options from './options';
+import { COMMENT_TYPE } from './constants';
 
 let vnodeId = 0;
 
@@ -12,6 +13,10 @@ let vnodeId = 0;
  * @returns {import('./internal').VNode}
  */
 export function createElement(type, props, children) {
+	if (type === '!--') {
+		return createVNode(COMMENT_TYPE, children, null, null);
+	}
+
 	let normalizedProps = {},
 		key,
 		ref,
diff --git a/src/diff/index.js b/src/diff/index.js
index b6243a8bef..ee9b61767d 100644
--- a/src/diff/index.js
+++ b/src/diff/index.js
@@ -1,4 +1,4 @@
-import { EMPTY_OBJ } from '../constants';
+import { COMMENT_TYPE, EMPTY_OBJ } from '../constants';
 import { Component, getDomSibling } from '../component';
 import { Fragment } from '../create-element';
 import { diffChildren } from './children';
@@ -355,8 +355,11 @@ function diffElementNodes(
 			// excessDomChildren so it isn't later removed in diffChildren
 			if (
 				child &&
-				'setAttribute' in child === !!nodeType &&
-				(nodeType ? child.localName === nodeType : child.nodeType === 3)
+				(nodeType === COMMENT_TYPE
+					? child.nodeType === COMMENT_TYPE
+					: nodeType
+					? child.localName === nodeType
+					: child.nodeType === 3)
 			) {
 				dom = child;
 				excessDomChildren[i] = null;
@@ -369,6 +372,9 @@ function diffElementNodes(
 		if (nodeType === null) {
 			// @ts-ignore createTextNode returns Text, we expect PreactElement
 			return document.createTextNode(newProps);
+		} else if (nodeType === COMMENT_TYPE) {
+			// @ts-ignore createComment returns Comment, we expect PreactElement
+			return document.createComment(newProps);
 		}
 
 		if (isSvg) {
@@ -391,7 +397,7 @@ function diffElementNodes(
 		isHydrating = false;
 	}
 
-	if (nodeType === null) {
+	if (nodeType === null || nodeType === COMMENT_TYPE) {
 		// During hydration, we still have to split merged text from SSR'd HTML.
 		if (oldProps !== newProps && (!isHydrating || dom.data !== newProps)) {
 			dom.data = newProps;
diff --git a/src/index.d.ts b/src/index.d.ts
index eb192aa15c..1e8637b241 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -187,6 +187,11 @@ export abstract class Component<P, S> {
 // Preact createElement
 // -----------------------------------
 
+export function createElement(
+	type: '!--',
+	props: unknown,
+	children: string
+): VNode<any>;
 export function createElement(
 	type: 'input',
 	props:
@@ -229,6 +234,7 @@ export namespace createElement {
 	export import JSX = JSXInternal;
 }
 
+export function h(type: '!--', props: unknown, children: string): VNode<any>;
 export function h(
 	type: 'input',
 	props:
diff --git a/src/internal.d.ts b/src/internal.d.ts
index 57faa0ded0..224cac7f79 100644
--- a/src/internal.d.ts
+++ b/src/internal.d.ts
@@ -102,9 +102,11 @@ type RefObject<T> = { current: T | null };
 type RefCallback<T> = { (instance: T | null): void; current: undefined };
 type Ref<T> = RefObject<T> | RefCallback<T>;
 
+type COMMENT_TYPE = 8;
+
 export interface VNode<P = {}> extends preact.VNode<P> {
 	// Redefine type here using our internal ComponentType type
-	type: string | ComponentType<P>;
+	type: string | ComponentType<P> | COMMENT_TYPE;
 	props: P & { children: ComponentChildren };
 	ref?: Ref<any> | null;
 	_children: Array<VNode<any>> | null;
diff --git a/test/browser/comments.test.js b/test/browser/comments.test.js
new file mode 100644
index 0000000000..1ac65637c6
--- /dev/null
+++ b/test/browser/comments.test.js
@@ -0,0 +1,143 @@
+import { h, createElement, render, hydrate, Fragment } from 'preact';
+import { setupScratch, teardown } from '../_util/helpers';
+
+/** @jsx createElement */
+/** @jsxFrag Fragment */
+
+const COMMENT = '!--';
+
+describe('keys', () => {
+	/** @type {HTMLDivElement} */
+	let scratch;
+
+	beforeEach(() => {
+		scratch = setupScratch();
+	});
+
+	afterEach(() => {
+		teardown(scratch);
+	});
+
+	it('should not render comments', () => {
+		render(h(COMMENT, null, 'test'), scratch);
+		expect(scratch.innerHTML).to.equal('<!--test-->');
+	});
+
+	it('should render comments in elements', () => {
+		render(<div>{h(COMMENT, null, 'test')}</div>, scratch);
+		expect(scratch.innerHTML).to.equal('<div><!--test--></div>');
+	});
+
+	it('should render Components that return comments', () => {
+		function App() {
+			return h(COMMENT, null, 'test');
+		}
+		render(<App />, scratch);
+		expect(scratch.innerHTML).to.equal('<!--test-->');
+	});
+
+	it('should render Fragments that wrap comments', () => {
+		function App() {
+			return <Fragment>{h(COMMENT, null, 'test')}</Fragment>;
+		}
+		render(<App />, scratch);
+		expect(scratch.innerHTML).to.equal('<!--test-->');
+	});
+
+	it('should render components that use comments to delimit start and end of a component', () => {
+		function App() {
+			return (
+				<div>
+					{h(COMMENT, null, 'start')}
+					<div>test</div>
+					{h(COMMENT, null, 'end')}
+				</div>
+			);
+		}
+		render(<App />, scratch);
+		expect(scratch.innerHTML).to.equal(
+			'<div><!--start--><div>test</div><!--end--></div>'
+		);
+	});
+
+	it('should render components that use comments to delimit start and end of a component with a Fragment', () => {
+		function App() {
+			return (
+				<Fragment>
+					{h(COMMENT, null, 'start')}
+					<div>test</div>
+					{h(COMMENT, null, 'end')}
+				</Fragment>
+			);
+		}
+		render(<App />, scratch);
+		expect(scratch.innerHTML).to.equal('<!--start--><div>test</div><!--end-->');
+	});
+
+	it('should move comments to the correct location when moving a component', () => {
+		function Child() {
+			return (
+				<>
+					{h(COMMENT, null, 'start')}
+					<div>test</div>
+					{h(COMMENT, null, 'end')}
+				</>
+			);
+		}
+
+		/** @type {(props: { move?: boolean }) => any} */
+		function App({ move = false }) {
+			if (move) {
+				return [
+					<div key="a">a</div>,
+					<Child key="child" />,
+					<div key="b">b</div>
+				];
+			}
+
+			return [
+				<Child key="child" />,
+				<div key="a">a</div>,
+				<div key="b">b</div>
+			];
+		}
+
+		const childHTML = '<!--start--><div>test</div><!--end-->';
+
+		render(<App />, scratch);
+		expect(scratch.innerHTML).to.equal(`${childHTML}<div>a</div><div>b</div>`);
+
+		render(<App move />, scratch);
+		expect(scratch.innerHTML).to.equal(`<div>a</div>${childHTML}<div>b</div>`);
+
+		render(<App />, scratch);
+		expect(scratch.innerHTML).to.equal(`${childHTML}<div>a</div><div>b</div>`);
+	});
+
+	it('should correctly show hide DOM around comments', () => {
+		function App({ show = false }) {
+			return (
+				<>
+					{h(COMMENT, null, 'start')}
+					{show && <div>test</div>}
+					{h(COMMENT, null, 'end')}
+				</>
+			);
+		}
+
+		render(<App />, scratch);
+		expect(scratch.innerHTML).to.equal('<!--start--><!--end-->');
+
+		render(<App show />, scratch);
+		expect(scratch.innerHTML).to.equal('<!--start--><div>test</div><!--end-->');
+
+		render(<App />, scratch);
+		expect(scratch.innerHTML).to.equal('<!--start--><!--end-->');
+	});
+
+	it('should hydrate comments VNodes', () => {
+		scratch.innerHTML = '<div><!--test--></div>';
+		hydrate(<div>{h(COMMENT, null, 'test')}</div>, scratch);
+		expect(scratch.innerHTML).to.equal('<div><!--test--></div>');
+	});
+});