diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5585c78fa..154c84af6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -277,6 +277,8 @@ if(LIB_INSTALL_DIR)
     set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}")
 endif()
 
+add_subdirectory(framework)
+
 add_subdirectory(include)
 
 add_subdirectory(3rdparty)
diff --git a/Makefile b/Makefile
index 885948c11..2e41abaec 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@ DESTDIR=/usr/local
 PREFIX=mbedtls_
 PERL ?= perl
 
+include framework/exported.make
+
 .SILENT:
 
 .PHONY: all no_test programs lib tests install uninstall clean test check lcov apidoc apidoc_clean
diff --git a/library/Makefile b/library/Makefile
index d11a98df0..d5e4f64ce 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -1,3 +1,4 @@
+include ../framework/exported.make
 
 # Also see "include/mbedtls/mbedtls_config.h"
 
diff --git a/scripts/common.make b/scripts/common.make
index 2714bcd32..2da58d00e 100644
--- a/scripts/common.make
+++ b/scripts/common.make
@@ -4,6 +4,8 @@ ifndef MBEDTLS_PATH
 MBEDTLS_PATH := ..
 endif
 
+include $(MBEDTLS_PATH)/framework/exported.make
+
 CFLAGS	?= -O2
 WARNING_CFLAGS ?= -Wall -Wextra -Wformat=2 -Wno-format-nonliteral
 WARNING_CXXFLAGS ?= -Wall -Wextra -Wformat=2 -Wno-format-nonliteral