diff --git a/make/run.mk b/make/run.mk
index 21df62f9..5f0c5a45 100644
--- a/make/run.mk
+++ b/make/run.mk
@@ -3,13 +3,7 @@
 # contact@jannet.de
 # $Id$
 
-ifeq ($(EXE),)
-ifneq ($(TARGET),mingw)
-EXE = $(notdir $(shell pwd))
-else
-EXE = $(notdir $(shell pwd)).exe
-endif
-endif
+EXE_BASENAME ?= $(notdir $(shell pwd))
 
 include $(MODDIR)/make/defs.mk
 BUILD_HDR =
@@ -30,8 +24,10 @@ valgrind:
 	valgrind $(VALGRIND_OPTS) ./$(EXE) $(EXE_ARGS)
 	
 ifeq ($(TARGET),mingw)
-run: start.bat
-	cat start.bat | wine cmd
+run:
+	@echo "wine $(EXE) $(EXE_ARGS)"
+	@echo -e "set PATH=%PATH;$(DLL_PATH)\n" \
+		"$(EXE) $(EXE_ARGS)" | wine cmd
 
 clean: winrunclean