--- old/make/Makefile	2016-01-29 10:22:50.000000000 -0600
+++ new/make/Makefile	2016-01-29 10:22:50.000000000 -0600
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -109,18 +109,11 @@
 all_debug:     debug1 docs export_debug
 all_optimized: optimized1 docs export_optimized
 else
-ifeq ($(MACOSX_UNIVERSAL),true)
-all_product:   universal_product
-all_fastdebug: universal_fastdebug
-all_debug:     universal_debug
-all_optimized: universal_optimized
-else
 all_product:   $(COMMON_VM_PRODUCT_TARGETS)
 all_fastdebug: $(COMMON_VM_FASTDEBUG_TARGETS)
 all_debug:     $(COMMON_VM_DEBUG_TARGETS)
 all_optimized: $(COMMON_VM_OPTIMIZED_TARGETS)
 endif
-endif
 
 allzero:           all_productzero all_fastdebugzero
 all_productzero:   productzero docs export_product
@@ -854,11 +847,9 @@
 	@$(ECHO) \
 "  $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(VERSION_STRING)"
 
-# Universal build support
+# Mac OS X build support
 ifeq ($(OS_VENDOR), Darwin)
-ifeq ($(MACOSX_UNIVERSAL),true)
-include $(GAMMADIR)/make/$(OSNAME)/makefiles/universal.gmk
-endif
+include $(GAMMADIR)/make/$(OSNAME)/makefiles/macosx.gmk
 endif
 
 # Compatibility for transition to new naming