diff --git a/src/codegen.cpp b/src/codegen.cpp
index 5faeb5b16adfd..e4176163f5dfc 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -33,6 +33,9 @@
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Analysis/Passes.h"
 #include "llvm/Bitcode/ReaderWriter.h"
+#if defined(LLVM_VERSION_MAJOR) && LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 5
+#define LLVM35 1
+#endif
 #if defined(LLVM_VERSION_MAJOR) && LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 4
 #define LLVM34 1
 #define USE_MCJIT 1
diff --git a/src/disasm.cpp b/src/disasm.cpp
index a206790480c61..c738b9e84c05a 100644
--- a/src/disasm.cpp
+++ b/src/disasm.cpp
@@ -197,7 +197,11 @@ void jl_dump_function_asm(void* Fptr, size_t Fsize,
         // Fall through
 
         case MCDisassembler::Success:
+        #ifdef LLVM35
+            Streamer->EmitInstruction(Inst, *STI);
+        #else
             Streamer->EmitInstruction(Inst);
+        #endif
         break;
         }
     }