diff --git a/.gitmodules b/.gitmodules
index 48c10c452cbd48639f7c314b5f4236d5d5ff12fc..4b0edb3474f64adf4a81b678bdca648e9f85ae45 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
 	shallow = true
 	path = libcapstone
 	url = https://github.com/aquynh/capstone.git
+[submodule "libehp"]
+	path = libehp
+	url = git@git.zephyr-software.com:allnp/libehp.git
diff --git a/SConscript b/SConscript
index e903bf20629827340f5e024865c3eb698722688f..9c5aa68797f7a92111313a2c47d01e76c51c8a64 100644
--- a/SConscript
+++ b/SConscript
@@ -58,10 +58,15 @@ else:
 
 env['BASE_IRDB_LIBS']="IRDB-core", "pqxx", "pq", "EXEIO"
 
+pedi = Command( target = "./testoutput",
+		source = "./SConscript",
+                action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
+
 if sysname != "SunOS":
 	libPEBLISS=SConscript("pebliss/trunk/pe_lib/SConscript", variant_dir='scons_build/libPEBLISS')
 	# setup libraries needed for linking
 	env['BASE_IRDB_LIBS']="IRDB-core", "pqxx", "pq", "EXEIO", "pebliss"
+	Depends(pedi,libPEBLISS)
 
 # pebliss requires iconv, which needs to be explicit on cygwin.
 if "CYGWIN" in sysname:
@@ -70,6 +75,9 @@ if "CYGWIN" in sysname:
 
 Export('env')
 
+libehp=env.SConscript("libehp/SConscript", variant_dir='scons_build/libehp')
+libehp=env.Install("$SECURITY_TRANSFORMS_HOME/lib", libehp);
+
 libtransform=SConscript("libtransform/SConscript", variant_dir='scons_build/libtransform')
 libEXEIO=SConscript("libEXEIO/SConscript", variant_dir='scons_build/libEXEIO')
 libbea=SConscript("beaengine/SConscript", variant_dir='scons_build/beaengine')
@@ -79,10 +87,8 @@ libIRDB=SConscript("libIRDB/SConscript", variant_dir='scons_build/libIRDB')
 libStructDiv=SConscript("libStructDiv/SConscript", variant_dir='scons_build/libStructDiv')
 libElfDep=SConscript("libElfDep/SConscript", variant_dir='scons_build/libElfDep')
 
-pedi = Command( target = "./testoutput",
-		source = "./SConscript",
-                action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
-Depends(pedi, (libEXEIO, libbea, libMEDSannotation,libxform,libtransform,libIRDB,libStructDiv, libElfDep))
+
+Depends(pedi, (libehp,libtransform,libEXEIO,libbea,libMEDSannotation,libxform,libIRDB,libStructDiv,libElfDep))
 
 tools=None
 if 'build_tools' not in env or env['build_tools'] is None or int(env['build_tools']) == 1:
diff --git a/libehp b/libehp
new file mode 160000
index 0000000000000000000000000000000000000000..59da9c4c4856423c6e7a2add814c7c2f5efd26f1
--- /dev/null
+++ b/libehp
@@ -0,0 +1 @@
+Subproject commit 59da9c4c4856423c6e7a2add814c7c2f5efd26f1