diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22f56628b..c2d6b2403 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - example: gatt_streamer_server and le_streamer_client report DLE and PHY changes
 - gatt_client: queue requests with gatt_client_request_to_send_gatt_query and gatt_client_request_to_write_without_response 
 - esp32: warn about unsuitable sdkconfig
+- esp32: drop support for Makefile projects from esp-idf 3.x
 
 ## Fixed
 - hci: fix set extended scan response
diff --git a/port/esp32/components/btstack/component.mk b/port/esp32/components/btstack/component.mk
deleted file mode 100644
index 4b14d3b1e..000000000
--- a/port/esp32/components/btstack/component.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
-
-# micro-ecc of ESP32 tree was moved into components/bootloader/micro-ecc in v3.3
-# we use our copy, but keep it private to not clash compiling the bootloader
-
-COMPONENT_ADD_INCLUDEDIRS := \
-	3rd-party/bluedroid/decoder/include \
-	3rd-party/bluedroid/encoder/include \
-	3rd-party/hxcmod-player \
-	3rd-party/hxcmod-player/mods \
-	3rd-party/lwip/dhcp-server \
-	3rd-party/md5 \
-	3rd-party/yxml \
-	src/classic \
-	src \
-	platform/embedded \
-	platform/freertos \
-	platform/lwip \
-	../lwip/lwip/src/include \
-	include \
-
-COMPONENT_PRIV_INCLUDEDIRS := \
-	3rd-party/micro-ecc \
-
-COMPONENT_SRCDIRS := \
-	3rd-party/bluedroid/decoder/srce \
-	3rd-party/bluedroid/encoder/srce \
-	3rd-party/hxcmod-player \
-	3rd-party/hxcmod-player/mods \
-	3rd-party/lwip/dhcp-server \
-	3rd-party/micro-ecc \
-	3rd-party/md5 \
-	3rd-party/yxml \
-	src/ble/gatt-service \
-	src/ble \
-	src/mesh \
-	src/ \
-	platform/embedded \
-	platform/freertos \
-	platform/lwip \
-	../lwip/lwip/src/apps/http \
-	. \
-
-ifdef CONFIG_IDF_TARGET_ESP32
-	COMPONENT_SRCDIRS += src/classic 
-endif
-
-CFLAGS += -Wno-format
diff --git a/port/esp32/create_examples.py b/port/esp32/create_examples.py
index cbd657489..02dbf2fcf 100755
--- a/port/esp32/create_examples.py
+++ b/port/esp32/create_examples.py
@@ -8,29 +8,6 @@ import sys
 import time
 import subprocess
 
-mk_template = '''#
-# BTstack example 'EXAMPLE' for ESP32 port
-#
-# Generated by TOOL
-# On DATE
-
-PROJECT_NAME := EXAMPLE
-
-include $(IDF_PATH)/make/project.mk
-'''
-
-component_mk_gatt_add_on = '''
-# app depends on compiled gatt db
-EXAMPLE.o: EXAMPLE.h
-
-# rule to compile gatt db
-EXAMPLE.h: $(COMPONENT_PATH)/EXAMPLE.gatt
-\t$(IDF_PATH)/components/btstack/tool/compile_gatt.py $^ $@
-
-# remove compiled gatt db on clean
-COMPONENT_EXTRA_CLEAN = EXAMPLE.h
-'''
-
 example_cmake_template = '''
 # BTstack example 'EXAMPLE' for ESP32 port
 #
@@ -101,10 +78,6 @@ def create_examples(script_path, suffix):
             dst = apps_folder + '/' + item
             shutil.copyfile(src, dst)
 
-        # create Makefile file
-        with open(apps_folder + "Makefile", "wt") as fout:
-            fout.write(mk_template.replace("EXAMPLE", example).replace("TOOL", script_path).replace("DATE",time.strftime("%c")))
-
         # create CMakeLists.txt file
         with open(apps_folder + "CMakeLists.txt", "wt") as fout:
             fout.write(example_cmake_template.replace("EXAMPLE", example).replace("TOOL", script_path).replace("DATE",time.strftime("%c")))
@@ -127,10 +100,6 @@ def create_examples(script_path, suffix):
             shutil.copy(examples_embedded + 'sco_demo_util.h', apps_folder + '/main/')
             main_files += ' "sco_demo_util.c"'
 
-        # add component.mk file to main folder
-        main_component_mk = apps_folder + "/main/component.mk"
-        shutil.copyfile(script_path + '/template/main/component.mk', main_component_mk)
-
         # create CMakeLists.txt file
         main_cmake_file = apps_folder + "/main/CMakeLists.txt"
         with open(main_cmake_file, "wt") as fout:
@@ -140,8 +109,6 @@ def create_examples(script_path, suffix):
         gatt_path = examples_embedded + example + ".gatt"
         if os.path.exists(gatt_path):
             shutil.copy(gatt_path, apps_folder + "/main/" + example + ".gatt")
-            with open(main_component_mk, "a") as fout:
-                fout.write(component_mk_gatt_add_on.replace("EXAMPLE", example))
             with open(main_cmake_file, "a") as fout:
                 fout.write(main_cmake_gatt_add_on.replace("EXAMPLE", example))
             print("- %s including GATT DB compilation rules" % example)
diff --git a/port/esp32/template/Makefile b/port/esp32/template/Makefile
deleted file mode 100644
index e1e593445..000000000
--- a/port/esp32/template/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := spp_and_le_streamer
-EXTRA_COMPONENT_DIRS := components
-
-include $(IDF_PATH)/make/project.mk
-
diff --git a/port/esp32/template/main/component.mk b/port/esp32/template/main/component.mk
deleted file mode 100644
index 1f6fff790..000000000
--- a/port/esp32/template/main/component.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the 
-# src/ directory, compile them and link them into lib(subdirectory_name).a 
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
-CFLAGS += -Wno-format
-