diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index 425f9c5dda2..0caef713865 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -1,7 +1,8 @@
 MODULE    = winver.exe
-APPMODE   = -mwindows
 IMPORTS   = shell32
 
+EXTRADLLFLAGS = -mwindows -mno-cygwin
+
 C_SRCS = winver.c
 
 RC_SRCS = version.rc
diff --git a/programs/winver/winver.c b/programs/winver/winver.c
index 96ee25748ab..019eb5248b2 100644
--- a/programs/winver/winver.c
+++ b/programs/winver/winver.c
@@ -18,11 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 #include "windows.h"
 #include "shellapi.h"
 
 int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 {
-   return !ShellAboutA(NULL, PACKAGE_NAME, PACKAGE_STRING, 0);
+    char name[128] = "Wine ";
+    const char * (CDECL *wine_get_version)(void);
+
+    wine_get_version = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "wine_get_version" );
+    if (wine_get_version) strcat( name, wine_get_version() );
+    return !ShellAboutA( NULL, name, NULL, 0 );
 }