diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile
index d1bd2d1..f9dddf6 100644
--- a/src/GvimExt/Makefile
+++ b/src/GvimExt/Makefile
@@ -16,8 +16,9 @@
 
 gvimext.dll:    gvimext.obj	\
 		gvimext.res
-  $(implib) /NOLOGO -machine:$(CPU) -def:gvimext.def $** -out:gvimext.lib
-  $(link) $(dlllflags) -base:0x1C000000 -out:$*.dll $** $(olelibsdll) shell32.lib gvimext.lib comctl32.lib gvimext.exp
+# $(implib) /NOLOGO -machine:$(CPU) -def:gvimext.def $** -out:gvimext.lib
+# $(link) $(dlllflags) -base:0x1C000000 -out:$*.dll $** $(olelibsdll) shell32.lib gvimext.lib comctl32.lib gvimext.exp
+  $(link) $(lflags) -dll -def:gvimext.def -base:0x1C000000 -out:$*.dll $** $(olelibsdll) shell32.lib comctl32.lib
 
 gvimext.obj: gvimext.h
 
diff --git a/src/GvimExt/gvimext.h b/src/GvimExt/gvimext.h
index 5eb5004..d688073 100644
--- a/src/GvimExt/gvimext.h
+++ b/src/GvimExt/gvimext.h
@@ -33,6 +33,12 @@
 
 #define INC_OLE2	// WIN32, get ole2 from windows.h
 
+/* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */
+#if _MSC_VER >= 1400
+# define _CRT_SECURE_NO_DEPRECATE
+# define _CRT_NONSTDC_NO_DEPRECATE
+#endif
+
 #include <windows.h>
 #include <windowsx.h>
 #include <shlobj.h>
diff --git a/src/GvimExt/gvimext.rc b/src/GvimExt/gvimext.rc
index 19a5d0c..22102db 100644
--- a/src/GvimExt/gvimext.rc
+++ b/src/GvimExt/gvimext.rc
@@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #ifndef __BORLANDC__
-# include "afxres.h"
+# include "winresrc.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////