diff --git a/libraries/external/numonyx_m25p128/hdllib.cfg b/libraries/external/numonyx_m25p128/hdllib.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..f6f07cb7a710fc8c5d8f6612c135421deefdff1b
--- /dev/null
+++ b/libraries/external/numonyx_m25p128/hdllib.cfg
@@ -0,0 +1,17 @@
+hdl_lib_name = numonyx_m25p128
+hdl_library_clause_name = numonyx_m25p128_lib
+hdl_lib_uses = 
+
+build_sim_dir = $HDL_BUILD_DIR
+build_synth_dir = 
+
+synth_files =
+test_bench_files = 
+    $UNB/Firmware/modules/Numonyx/NU_M25P128_V10/lib/StringLib.vhd
+    $UNB/Firmware/modules/Numonyx/NU_M25P128_V10/lib/def.vhd
+    $UNB/Firmware/modules/Numonyx/NU_M25P128_V10/lib/CUIcommandData.vhd
+    $UNB/Firmware/modules/Numonyx/NU_M25P128_V10/lib/data.vhd
+    $UNB/Firmware/modules/Numonyx/NU_M25P128_V10/lib/BlockLib.vhd
+    $UNB/Firmware/modules/Numonyx/NU_M25P128_V10/lib/TimingData.vhd
+    $UNB/Firmware/modules/Numonyx/NU_M25P128_V10/lib/MemoryLib.vhd
+    $UNB/Firmware/modules/Numonyx/NU_M25P128_V10/code/m25p128_model/M25P128.vhd
diff --git a/libraries/technology/altera/stratixiv/hdllib.cfg b/libraries/technology/altera/stratixiv/hdllib.cfg
index d9fd716773bb84451cbd3cd2b054ad4efa19aaac..ebb74bb38357600062169496480405a5121e9901 100644
--- a/libraries/technology/altera/stratixiv/hdllib.cfg
+++ b/libraries/technology/altera/stratixiv/hdllib.cfg
@@ -1,19 +1,11 @@
 hdl_lib_name = ip_stratixiv
 hdl_library_clause_name = ip_stratixiv_lib
-hdl_lib_uses = 
+hdl_lib_uses = numonyx_m25p128_lib
 
 build_sim_dir = $HDL_BUILD_DIR
 build_synth_dir = 
 
 synth_files =
-    $UNB/Firmware/modules/epcs/tb/vhdl/m25p128_model/StringLib.vhd
-    $UNB/Firmware/modules/epcs/tb/vhdl/m25p128_model/def.vhd
-    $UNB/Firmware/modules/epcs/tb/vhdl/m25p128_model/CUIcommandData.vhd
-    $UNB/Firmware/modules/epcs/tb/vhdl/m25p128_model/data.vhd
-    $UNB/Firmware/modules/epcs/tb/vhdl/m25p128_model/BlockLib.vhd
-    $UNB/Firmware/modules/epcs/tb/vhdl/m25p128_model/TimingData.vhd
-    $UNB/Firmware/modules/epcs/tb/vhdl/m25p128_model/MemoryLib.vhd
-    $UNB/Firmware/modules/epcs/tb/vhdl/m25p128_model/M25P128.vhd
     ip_stratixiv_asmi_parallel.vhd
     ip_stratixiv_remote_update.vhd
     
diff --git a/libraries/technology/altera/stratixiv/ip_stratixiv_asmi_parallel.vhd b/libraries/technology/altera/stratixiv/ip_stratixiv_asmi_parallel.vhd
index cd9445467748dc76d1cd911b26c9a754f48a1e22..1e3f83df1107c07c6b8bd6b3bb72ac52ddf9ccab 100644
--- a/libraries/technology/altera/stratixiv/ip_stratixiv_asmi_parallel.vhd
+++ b/libraries/technology/altera/stratixiv/ip_stratixiv_asmi_parallel.vhd
@@ -44,6 +44,8 @@
 
  LIBRARY stratixiv;
  USE stratixiv.all;
+ 
+ LIBRARY numonyx_m25p128_lib;
 
 --synthesis_resources = a_graycounter 4 lpm_compare 2 lpm_counter 2 lut 29 mux21 1 reg 106 stratixiv_asmiblock 1 
  LIBRARY ieee;
@@ -892,9 +894,9 @@
   -- ASTRON, DS:
   -- ==========
   -- synthesis translate_off
-  u_M25P128: ENTITY work.M25P128
+  u_M25P128: ENTITY numonyx_m25p128_lib.M25P128
   GENERIC MAP(
-    MemoryFileName => "../../../tb/vhdl/m25p128_model/sim/memory_file",
+    MemoryFileName => "../../../../../UniBoard/trunk/Firmware/modules/Numonyx/NU_M25P128_V10/sim/memory_file",
     TimingCheckOn  => FALSE
   )
   PORT MAP (