diff --git a/classpath/java-lang.cpp b/classpath/java-lang.cpp
index c9f7142fd8..514bfc40e1 100644
--- a/classpath/java-lang.cpp
+++ b/classpath/java-lang.cpp
@@ -38,7 +38,7 @@
 
 #ifdef __APPLE__
 #  define SO_SUFFIX ".jnilib"
-#include <Carbon/Carbon.h>
+#include <CoreServices/CoreServices.h>
 #elif defined WIN32
 #  define SO_SUFFIX ".dll"
 #else
diff --git a/makefile b/makefile
index 14cd6196d5..583d0fdb90 100644
--- a/makefile
+++ b/makefile
@@ -123,7 +123,7 @@ endif
 
 ifeq ($(platform),darwin)
 	build-cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
-	lflags = $(common-lflags) -ldl -framework CoreFoundation -framework Carbon
+	lflags = $(common-lflags) -ldl -framework CoreFoundation -framework CoreServices
 	ifeq ($(bootimage),true)
 		bootimage-lflags = -Wl,-segprot,__BOOT,rwx,rwx
 	endif