diff --git a/tools/ed/EnhancedDisassembly.exports.blocks b/tools/ed/EnhancedDisassembly.exports.blocks
new file mode 100644
index 00000000000..63738e53665
--- /dev/null
+++ b/tools/ed/EnhancedDisassembly.exports.blocks
@@ -0,0 +1,31 @@
+_EDGetDisassembler
+_EDGetRegisterName
+_EDRegisterIsStackPointer
+_EDRegisterIsProgramCounter
+_EDCreateInsts
+_EDReleaseInst
+_EDInstByteSize
+_EDGetInstString
+_EDInstIsBranch
+_EDInstIsMove
+_EDBranchTargetID
+_EDMoveSourceID
+_EDMoveTargetID
+_EDNumTokens
+_EDGetToken
+_EDGetTokenString
+_EDOperandIndexForToken
+_EDTokenIsWhitespace
+_EDTokenIsPunctuation
+_EDTokenIsOpcode
+_EDTokenIsLiteral
+_EDTokenIsRegister
+_EDTokenIsNegativeLiteral
+_EDLiteralTokenAbsoluteValue
+_EDRegisterTokenValue
+_EDNumOperands
+_EDGetOperand
+_EDEvaluateOperand
+_EDBlockCreateInsts
+_EDBlockEvaluateOperand
+_EDBlockVisitTokens
diff --git a/tools/ed/EnhancedDisassembly.exports b/tools/ed/EnhancedDisassembly.exports.noblocks
similarity index 100%
rename from tools/ed/EnhancedDisassembly.exports
rename to tools/ed/EnhancedDisassembly.exports.noblocks
diff --git a/tools/ed/Makefile b/tools/ed/Makefile
index a3c58796687..b5ec476f731 100644
--- a/tools/ed/Makefile
+++ b/tools/ed/Makefile
@@ -10,7 +10,7 @@
 LEVEL = ../..
 LIBRARYNAME = EnhancedDisassembly
 
-BUILT_SOURCES = EDInfo.inc
+BUILT_SOURCES = EDInfo.inc EnhancedDisassembly.exports
 
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this 
@@ -51,5 +51,17 @@ EDInfo.inc:	$(TBLGEN)
 	$(Echo) "Building semantic information header"
 	$(Verb) $(TableGen) -o $(call SYSPATH, $@) -gen-enhanced-disassembly-header /dev/null
 
+EnhancedDisassembly.exports:	EnhancedDisassembly.exports.noblocks EnhancedDisassembly.exports.blocks
+	$(Echo) "Copying exports file"
+ifeq ($(HOST_OS),Darwin)
+	$(Verb) if [ $(DARWIN_VERS) -ge 10 ] ; \
+	  then $(CP) -f EnhancedDisassembly.exports.blocks EnhancedDisassembly.exports ; \
+	  else $(CP) -f EnhancedDisassembly.exports.noblocks EnhancedDisassembly.exports ; \
+	fi
+else
+	$(Verb) $(CP) -f EnhancedDisassembly.exports.noblocks EnhancedDisassembly.exports
+endif
+
 clean::
 	-$(Verb) $(RM) -f EDInfo.inc
+	-$(Verb) $(RM) -f EnhancedDisassembly.exports