diff --git a/.gitignore b/.gitignore
index a8ec7848e8c..483b391359c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,6 +109,7 @@ dlls/d3dx8/libd3dx8.def
 dlls/d3dx8/tests/*.ok
 dlls/d3dx8/tests/d3dx8_crosstest.exe
 dlls/d3dx8/tests/testlist.c
+dlls/d3dx9_36/libd3dx9.def
 dlls/d3dxof/libd3dxof.def
 dlls/d3dxof/version.res
 dlls/dbghelp/libdbghelp.def
@@ -222,6 +223,7 @@ dlls/kernel32/tests/testlist.c
 dlls/kernel32/version16.res
 dlls/keyboard.drv16
 dlls/krnl386.exe16
+dlls/libd3dx9.def
 dlls/libwinspool.def
 dlls/localspl/localspl.res
 dlls/localspl/tests/*.ok
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 96e3a850988..d294a1939da 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -518,6 +518,7 @@ winsock.dll16:
 STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a)
 
 IMPORT_SYMLINKS = \
+	libd3dx9.$(IMPLIBEXT) \
 	libwinspool.$(IMPLIBEXT)
 
 IMPORT_LIBS = \
@@ -553,6 +554,7 @@ IMPORT_LIBS = \
 	d3dim/libd3dim.$(IMPLIBEXT) \
 	d3drm/libd3drm.$(IMPLIBEXT) \
 	d3dx8/libd3dx8.$(IMPLIBEXT) \
+	d3dx9_36/libd3dx9.$(IMPLIBEXT) \
 	d3dxof/libd3dxof.$(IMPLIBEXT) \
 	dbghelp/libdbghelp.$(IMPLIBEXT) \
 	dciman32/libdciman32.$(IMPLIBEXT) \
@@ -739,6 +741,9 @@ d3drm/libd3drm.$(IMPLIBEXT): d3drm/d3drm.spec $(WINEBUILD)
 d3dx8/libd3dx8.$(IMPLIBEXT): d3dx8/d3dx8.spec $(WINEBUILD)
 	@cd d3dx8 && $(MAKE) libd3dx8.$(IMPLIBEXT)
 
+d3dx9_36/libd3dx9.$(IMPLIBEXT): d3dx9_36/d3dx9_36.spec $(WINEBUILD)
+	@cd d3dx9_36 && $(MAKE) libd3dx9.$(IMPLIBEXT)
+
 d3dxof/libd3dxof.$(IMPLIBEXT): d3dxof/d3dxof.spec $(WINEBUILD)
 	@cd d3dxof && $(MAKE) libd3dxof.$(IMPLIBEXT)
 
@@ -1057,6 +1062,9 @@ wsock32/libwsock32.$(IMPLIBEXT): wsock32/wsock32.spec $(WINEBUILD)
 wtsapi32/libwtsapi32.$(IMPLIBEXT): wtsapi32/wtsapi32.spec $(WINEBUILD)
 	@cd wtsapi32 && $(MAKE) libwtsapi32.$(IMPLIBEXT)
 
+libd3dx9.$(IMPLIBEXT): d3dx9_36/libd3dx9.$(IMPLIBEXT)
+	$(RM) $@ && $(LN_S) d3dx9_36/libd3dx9.$(IMPLIBEXT) $@
+
 libwinspool.$(IMPLIBEXT): winspool.drv/libwinspool.$(IMPLIBEXT)
 	$(RM) $@ && $(LN_S) winspool.drv/libwinspool.$(IMPLIBEXT) $@
 
diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
index b2a4f4cdfab..9c3e080543b 100644
--- a/dlls/d3dx9_36/Makefile.in
+++ b/dlls/d3dx9_36/Makefile.in
@@ -3,12 +3,21 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_36.dll
+IMPORTLIB = libd3dx9.$(IMPLIBEXT)
 IMPORTS   = d3d9 d3dx8 kernel32
-EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	d3dx9_36_main.c
 
 @MAKE_DLL_RULES@
 
+libd3dx9.def: $(MAINSPEC)
+	$(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
+
+libd3dx9.a: $(SPEC_DEF)
+	$(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
+
+clean::
+	$(RM) $(IMPORTLIB)
+
 @DEPENDENCIES@  # everything below this line is overwritten by make depend