diff --git a/bld/trap/lcl/os2v2/splice/makefile b/bld/trap/lcl/os2v2/splice/makefile
index f43a23fd1b..b1e017fef1 100644
--- a/bld/trap/lcl/os2v2/splice/makefile
+++ b/bld/trap/lcl/os2v2/splice/makefile
@@ -18,6 +18,7 @@ sys_dll  = 1
 
 !include cproj.mif
 !include defrule.mif
+!include dllrule.mif
 !include deftarg.mif
 
 dig_arch = $(host_cpu)
@@ -44,5 +45,6 @@ extra_l_flags_dll = op oneautodata
 #
 # DLL
 #
-dlltarg_objs = splice.obj
+dlltarg_prebuild_objs = $(dll_subdir)
+dlltarg_objs = $(dll_subdir)/splice.obj
 !include dlltarg.mif
diff --git a/bld/trap/lcl/os2v2/wvpmhelp/makefile b/bld/trap/lcl/os2v2/wvpmhelp/makefile
index 9dc00f0a06..09cf4c4611 100644
--- a/bld/trap/lcl/os2v2/wvpmhelp/makefile
+++ b/bld/trap/lcl/os2v2/wvpmhelp/makefile
@@ -14,14 +14,17 @@ proj_name = wdpmhelp
 wdpmhelp_autodepends = .AUTODEPEND
 !endif
 
+wdpmhelp_nocheckstack_dll = 1
+
 !include cproj.mif
 !include defrule.mif
+!include dllrule.mif
 !include deftarg.mif
 
 #
 # cflags
 #
-.c: ../c
+.c: ../c;$(trap_dir)/common
 
 inc_dirs = -I. -I"../h" -I"$(trap_dir)/h"
 
@@ -48,7 +51,8 @@ w d : wdpmhook.dll wdpmhelp.exe .SYMBOLIC
 #
 # DLL
 #
-dlltarg_objs = pmhook.obj
+dlltarg_prebuild_objs = $(dll_subdir)
+dlltarg_objs = $(dll_subdir)/pmhook.obj
 dlltarg_name = wdpmhook
 !include dlltarg.mif
 
diff --git a/bld/trap/par/os2v2.pio/makefile b/bld/trap/par/os2v2.pio/makefile
index 167fc626eb..d51a68ce1c 100644
--- a/bld/trap/par/os2v2.pio/makefile
+++ b/bld/trap/par/os2v2.pio/makefile
@@ -15,8 +15,6 @@ os2v2pio_autodepends = .AUTODEPEND
 # I/O can be built into the parallel trap file/server modules, which is
 # where it belongs in the first place.
 
-sys_dll = 1
-
 !include cproj.mif
 !include defrule.mif
 !include deftarg.mif
@@ -25,15 +23,16 @@ sys_dll = 1
 
 inc_dirs = -I"../h"
 
-extra_c_flags_wdio = -nt=port -nc=IOPL_CODE
-
-extra_l_flags = op protmode
-
-extra_linker = segment 'port' IOPL &
-	export INPORT 2 &
-	export OUTPORT 4
-
-dlltarg_objs    = wdio.obj
-dlltarg_name    = wdio
-dlltarg_opts    = $(extra_linker)
-!include dlltarg.mif
+extra_c_flags_wdio = -nt=port -nc=IOPL_CODE -zls
+
+wdio.dll : wdio.obj
+    $(noecho)%create $^&.lnk
+    @%append $^&.lnk format os2 dll option osname='OS/2 16-bit DLL'
+    @%append $^&.lnk op map, elim, protmode, nodef
+    @%append $^&.lnk name $@
+    @%append $^&.lnk file wdio.obj
+    @%append $^&.lnk segment 'port' IOPL 
+    @%append $^&.lnk export INPORT 2
+    @%append $^&.lnk export OUTPORT 4
+    @%make echo_link
+    $(linker) @$^&.lnk