diff --git a/examples/http-client/Makefile b/examples/http-client/Makefile
index b7393606..bbdb7b6d 100644
--- a/examples/http-client/Makefile
+++ b/examples/http-client/Makefile
@@ -1,38 +1,32 @@
+PROG ?= example                   # Program we are building
+DELETE = rm -rf                   # Command to remove files
+OUT ?= -o $(PROG)                 # Compiler argument for output file
 SOURCES = main.c mongoose.c       # Source code files
 CFLAGS = -W -Wall -Wextra -g -I.  # Build options
 
 # Mongoose build options. See https://mongoose.ws/documentation/#build-options
 CFLAGS_MONGOOSE += -DMG_ENABLE_LINES=1
 
-SSL = ?
-ifeq "$(SSL)" "MBEDTLS"
-CFLAGS += -lmbedtls -lmbedcrypto -lmbedx509
-CFLAGS_MONGOOSE += -DMG_ENABLE_MBEDTLS=1
-endif
-ifeq "$(SSL)" "OPENSSL"
-CFLAGS += -lssl -lcrypto
-CFLAGS_MONGOOSE += -DMG_ENABLE_OPENSSL=1
-endif
-
-ifeq ($(OS),Windows_NT)
-  # Windows settings. Assume MinGW compiler. To use VC: make CC=cl CFLAGS=/MD OUT=/Feprog.exe
+ifeq ($(OS),Windows_NT)   # Windows settings. Assume MinGW compiler. To use VC: make CC=cl CFLAGS=/MD OUT=/Feprog.exe
   PROG ?= example.exe           # Use .exe suffix for the binary
   CC = gcc                      # Use MinGW gcc compiler
   CFLAGS += -lws2_32            # Link against Winsock library
   DELETE = cmd /C del /Q /F /S  # Command prompt command to delete files
   OUT ?= -o $(PROG)             # Build output
-else
-  # Mac, Linux
-  PROG ?= example
-  DELETE = rm -rf
-  OUT ?= -o $(PROG)
+  MAKE += WINDOWS=1 CC=$(CC)
 endif
 
-all: $(PROG)
+all: $(PROG)              # Default target. Build and run program
 	$(RUN) ./$(PROG) $(ARGS)
 
-$(PROG): $(SOURCES)
+$(PROG): $(SOURCES)       # Build program from sources
 	$(CC) $(SOURCES) $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA) $(OUT)
 
-clean:
-	$(DELETE) $(PROG) *.o *.obj *.exe *.dSYM
+clean:                    # Cleanup. Delete built program and all build artifacts
+	$(DELETE) $(PROG) *.o *.obj *.exe *.dSYM mbedtls
+
+# see https://mongoose.ws/tutorials/tls/#how-to-build for TLS build options
+
+mbedtls:                  # Pull and build mbedTLS library
+	git clone --depth 1 -b v2.28.2 https://github.com/mbed-tls/mbedtls $@
+	$(MAKE) -C mbedtls/library
diff --git a/examples/http-server/Makefile b/examples/http-server/Makefile
index 2770e93c..b5b1b1eb 100644
--- a/examples/http-server/Makefile
+++ b/examples/http-server/Makefile
@@ -1,3 +1,6 @@
+PROG ?= example                   # Program we are building
+DELETE = rm -rf                   # Command to remove files
+OUT ?= -o $(PROG)                 # Compiler argument for output file
 SOURCES = main.c mongoose.c       # Source code files
 CFLAGS = -W -Wall -Wextra -g -I.  # Build options
 
@@ -5,25 +8,19 @@ CFLAGS = -W -Wall -Wextra -g -I.  # Build options
 CFLAGS_MONGOOSE += -DMG_HTTP_DIRLIST_TIME=1 -DMG_ENABLE_SSI=1
 CFLAGS_MONGOOSE += -DMG_ENABLE_LINES=1 -DMG_ENABLE_IPV6=1
 
-ifeq ($(OS),Windows_NT)
-  # Windows settings. Assume MinGW compiler. To use VC: make CC=cl CFLAGS=/MD OUT=/Feprog.exe
+ifeq ($(OS),Windows_NT)   # Windows settings. Assume MinGW compiler. To use VC: make CC=cl CFLAGS=/MD OUT=/Feprog.exe
   PROG ?= example.exe           # Use .exe suffix for the binary
   CC = gcc                      # Use MinGW gcc compiler
   CFLAGS += -lws2_32            # Link against Winsock library
-  DELETE = cmd /C del /q /f /s  # Command prompt command to delete files
+  DELETE = cmd /C del /Q /F /S  # Command prompt command to delete files
   OUT ?= -o $(PROG)             # Build output
-else
-  # Mac, Linux
-  PROG ?= example
-  DELETE = rm -rf
-  OUT ?= -o $(PROG)
 endif
 
-all: $(PROG)
+all: $(PROG)              # Default target. Build and run program
 	$(RUN) ./$(PROG) $(ARGS)
 
-$(PROG): $(SOURCES)
+$(PROG): $(SOURCES)       # Build program from sources
 	$(CC) $(SOURCES) $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA) $(OUT)
 
-clean:
+clean:                    # Cleanup. Delete built program and all build artifacts
 	$(DELETE) $(PROG) *.o *.obj *.exe *.dSYM