diff --git a/claat/Makefile b/claat/Makefile
index 20290d3da..92fad1b3b 100644
--- a/claat/Makefile
+++ b/claat/Makefile
@@ -64,3 +64,9 @@ $(OUTDIR)/claat-%: $(SRCS) VERSION
 
 sample: $(OUTDIR)/claat
 	$(OUTDIR)/claat export -o ../sample/ ../sample/codelab.md
+
+sample-watch: sample
+	# This is no good, because serve will keep running in the background even after Ctrl-C:
+	# cd ../sample && ../claat/bin/claat serve & && echo codelab.md | entr ../claat/bin/claat export codelab.md
+    # TODO This would be a lot more convenient if serve had a flag to prevent it from keep opening the browser, and could be given the root dir as argument..
+	cd ../sample && echo codelab.md | entr -rs "../claat/bin/claat export codelab.md && ../claat/bin/claat serve"