diff --git a/googlemock/make/Makefile b/googlemock/make/Makefile
index 386293a0..fb1445a1 100644
--- a/googlemock/make/Makefile
+++ b/googlemock/make/Makefile
@@ -59,7 +59,16 @@ GMOCK_HEADERS = $(GMOCK_DIR)/include/gmock/*.h \
 
 # House-keeping build targets.
 
-all : $(GTEST_LIBS) $(TESTS)
+ifndef GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND
+.PHONY all:
+	$(info "The Make buildsystem is no longer supported")
+	$(info "You can temporarily set GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND=1")
+	$(info "i.e make GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND=1 all")
+	$(info "But this is going away very soon. ")
+	$(exit 1)
+else
+all: $(GTEST_LIBS) $(TESTS)
+endif
 
 clean :
 	rm -f $(GTEST_LIBS) $(TESTS) *.o
diff --git a/googletest/make/Makefile b/googletest/make/Makefile
index b62da67a..3f2ffce2 100644
--- a/googletest/make/Makefile
+++ b/googletest/make/Makefile
@@ -44,7 +44,16 @@ GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
 
 # House-keeping build targets.
 
-all : $(GTEST_LIBS) $(TESTS)
+ifndef GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND
+.PHONY all:
+	$(info "The Make buildsystem is no longer supported")
+	$(info "You can temporarily set GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND=1")
+	$(info "i.e make GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND=1 all")
+	$(info "But this is going away very soon. ")
+	$(exit 1)
+else
+all: $(GTEST_LIBS) $(TESTS)
+endif
 
 clean :
 	rm -f $(GTEST_LIBS) $(TESTS) *.o