diff --git a/Makefile b/Makefile
index f04bc3de..8834b6be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2010-2014, Intel Corporation
+#  Copyright (c) 2010-2015, Intel Corporation
 #  All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
@@ -124,6 +124,13 @@ endif
 # This 'ifneq' acts like if( !($(LLVM_VERSION) == LLVM_3_2 || $(LLVM_VERSION) == LLVM_3_3 || $(LLVM_VERSION) == LLVM_3_4))
 ifeq (,$(filter $(LLVM_VERSION), LLVM_3_2 LLVM_3_3 LLVM_3_4))
     ISPC_LIBS += -lcurses -lz
+    # This is here because llvm-config fails to report dependency on tinfo library in some case.
+    # This is described in LLVM bug 16902.
+    ifeq ($(ARCH_OS),Linux)
+        ifneq ($(shell ldconfig -p |grep -c option), 0)
+            ISPC_LIBS += -ltinfo
+	endif
+    endif
 endif
 
 ifeq ($(ARCH_OS),Linux)