diff --git a/irdb-libs/SConscript b/irdb-libs/SConscript
index 55347a8d50c8dd8a3ba68cc3a2a56fe1134c0148..354fd54d82dadeaf7a876966ce1ec3fdacca60eb 100644
--- a/irdb-libs/SConscript
+++ b/irdb-libs/SConscript
@@ -57,6 +57,15 @@ libcapstone_path = env.Install("$SECURITY_TRANSFORMS_HOME/lib/", libcapstone_pat
 env.Command(os.environ['SECURITY_TRANSFORMS_HOME']+"/lib/libcapstone.so", libcapstone_path, "ln -s $SOURCE.abspath $TARGET.abspath")
 libcapstone=os.environ['SECURITY_TRANSFORMS_HOME']+"/lib/libcapstone.so"
 
+# get the libkeystone.so.[version] file regardless of the version extension
+libkeystone_path = Glob(os.environ['SECURITY_TRANSFORMS_HOME']+'/lib/usr/local/lib/libkeystone.so.*')
+assert len(libkeystone_path) <= 1, "More than one candidate for libkeystone.so.[version]?!"
+
+libkeystone_path = env.Install("$SECURITY_TRANSFORMS_HOME/lib/", libkeystone_path)
+
+env.Command(os.environ['SECURITY_TRANSFORMS_HOME']+"/lib/libkeystone.so", libkeystone_path, "ln -s $SOURCE.abspath $TARGET.abspath")
+libkeystone=os.environ['SECURITY_TRANSFORMS_HOME']+"/lib/libkeystone.so"
+
 libehp=env.SConscript("libehp/SConscript")
 libehp=env.Install("$SECURITY_TRANSFORMS_HOME/lib", libehp);
 
diff --git a/irdb-libs/libIRDB-cfg/src/SConscript b/irdb-libs/libIRDB-cfg/src/SConscript
index 17ecf7b5232a4fb6214c975845070e75f0983216..821622ad61101a010e2b3df1de29502f83f2aa1b 100644
--- a/irdb-libs/libIRDB-cfg/src/SConscript
+++ b/irdb-libs/libIRDB-cfg/src/SConscript
@@ -15,7 +15,8 @@ cpppath='''
 	$SECURITY_TRANSFORMS_HOME/include/
 	$SECURITY_TRANSFORMS_HOME/libIRDB-core/include/
 	$SECURITY_TRANSFORMS_HOME/libIRDB-cfg/include/
-	'''
+        $SECURITY_TRANSFORMS_HOME/third_party/keystone/include/keystone/
+ 	'''
 libpath='''
 	$SECURITY_TRANSFORMS_HOME/lib
 	'''
diff --git a/irdb-libs/libIRDB-core/include/fileir.hpp b/irdb-libs/libIRDB-core/include/fileir.hpp
index 033a3369431aafca124f305ea39d469fcce428ce..52c786a363ab12d88e4c4901fafb271c2bf47cdd 100644
--- a/irdb-libs/libIRDB-core/include/fileir.hpp
+++ b/irdb-libs/libIRDB-core/include/fileir.hpp
@@ -17,7 +17,8 @@
  * URL   : http://www.zephyr-software.com/
  *
  */
-#include <keystone/keystone.h>
+//#include <keystone/keystone.h>
+#include <keystone.h>
 
 namespace libIRDB
 {
diff --git a/irdb-libs/libIRDB-core/src/SConscript b/irdb-libs/libIRDB-core/src/SConscript
index 7822295ec56c96eac110349c3d23de8462e2e690..eeeb4b8a2136d2bcfc7f1c8dd395cbb3b5f17a45 100644
--- a/irdb-libs/libIRDB-core/src/SConscript
+++ b/irdb-libs/libIRDB-core/src/SConscript
@@ -50,7 +50,7 @@ cpppath='''
 	$SECURITY_TRANSFORMS_HOME/include/
 	$SECURITY_TRANSFORMS_HOME/libIRDB-core/include/
 	$SECURITY_TRANSFORMS_HOME/third_party/capstone/include/capstone/
-	$SECURITY_TRANSFORMS_HOME/third_party/capstone/include/keystone/
+	$SECURITY_TRANSFORMS_HOME/third_party/keystone/include/keystone/
 	'''
 libpath='''
 	$SECURITY_TRANSFORMS_HOME/lib
diff --git a/irdb-libs/libIRDB-core/src/fileir.cpp b/irdb-libs/libIRDB-core/src/fileir.cpp
index e72aac159a6ac8bb9e26fbacd5c34e1ced198971..0ca30aa02e4f7a367650bc3f6a06d1a0171cf79a 100644
--- a/irdb-libs/libIRDB-core/src/fileir.cpp
+++ b/irdb-libs/libIRDB-core/src/fileir.cpp
@@ -19,7 +19,8 @@
  *
  */
 
-#include <keystone/keystone.h>
+#include <keystone.h>
+//#include <keystone/keystone.h>
 #include <all.hpp>
 #include <irdb-util>
 #include <cstdlib>
diff --git a/irdb-libs/libIRDB-core/src/instruction.cpp b/irdb-libs/libIRDB-core/src/instruction.cpp
index ceb81cac992282b86a463a30b560f64659404b89..d533a551ff3775e61646f7781d1601ca07cb9a1e 100644
--- a/irdb-libs/libIRDB-core/src/instruction.cpp
+++ b/irdb-libs/libIRDB-core/src/instruction.cpp
@@ -25,7 +25,8 @@
 #include <sstream>
 #include <iomanip>
 #include <irdb-util>
-#include <keystone/keystone.h>
+//#include <keystone/keystone.h>
+#include <keystone.h>
 #include "cmdstr.hpp"
 
 #undef EIP
diff --git a/irdb-libs/libIRDB-transform/src/SConscript b/irdb-libs/libIRDB-transform/src/SConscript
index 0c250bfeb153f70a9b77739937e968904158601a..a46c77030b0cb12df551e758404b5c8514e4bdec 100644
--- a/irdb-libs/libIRDB-transform/src/SConscript
+++ b/irdb-libs/libIRDB-transform/src/SConscript
@@ -15,6 +15,7 @@ cpppath='''
          $SECURITY_TRANSFORMS_HOME/libIRDB-cfg/include
          $SECURITY_TRANSFORMS_HOME/libIRDB-util/include
          $SECURITY_TRANSFORMS_HOME/libMEDSannotation/include/
+        $SECURITY_TRANSFORMS_HOME/third_party/keystone/include/keystone/
         '''
 
 
diff --git a/irdb-libs/libIRDB-util/src/SConscript b/irdb-libs/libIRDB-util/src/SConscript
index fee25b597ad027296a0ee24b950916fb0105c8e0..92ebc0c1f043bb47ee9155b1c70ac080b7be3de6 100644
--- a/irdb-libs/libIRDB-util/src/SConscript
+++ b/irdb-libs/libIRDB-util/src/SConscript
@@ -17,6 +17,7 @@ cpppath='''
 	$SECURITY_TRANSFORMS_HOME/include/
 	$SECURITY_TRANSFORMS_HOME/libIRDB-core/include/
 	$SECURITY_TRANSFORMS_HOME/libIRDB-util/include/
+        $SECURITY_TRANSFORMS_HOME/third_party/keystone/include/keystone/
 	'''
 
 #myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
diff --git a/irdb-libs/meds2pdb/SConscript b/irdb-libs/meds2pdb/SConscript
index bde4f83a38d24e47b0fda28642ec840294ef5eec..b795c0f23d4a2634fddc5458eb7fc0f2613af07b 100644
--- a/irdb-libs/meds2pdb/SConscript
+++ b/irdb-libs/meds2pdb/SConscript
@@ -12,6 +12,7 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/libIRDB-core/include 
 	 $SECURITY_TRANSFORMS_HOME/libEXEIO/include 
 	 $SECURITY_TRANSFORMS_HOME/libMEDSannotation/include 
+        $SECURITY_TRANSFORMS_HOME/third_party/keystone/include/keystone/
 	'''
 
 files=Glob( Dir('.').srcnode().abspath+"/*.cpp") + Glob(Dir('.').srcnode().abspath+"/*.c")
diff --git a/irdb-libs/thanos/SConscript b/irdb-libs/thanos/SConscript
index 75ff75ee9ffd6af4568071d137deed513c7a1e19..f137e4ebbe1111cd6a4dcb0b0e695693db695f65 100644
--- a/irdb-libs/thanos/SConscript
+++ b/irdb-libs/thanos/SConscript
@@ -9,6 +9,7 @@ myenv.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
 cpppath=''' 
 	 $IRDB_SDK/include 
 	 $SECURITY_TRANSFORMS_HOME/libIRDB-core/include 
+        $SECURITY_TRANSFORMS_HOME/third_party/keystone/include/keystone/
 	'''