diff --git a/Makefile.am b/Makefile.am
index e677126..6aea0ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,6 @@ RUNDIR=$(top_builddir)/.run
 run:
 	rm -rf $(RUNDIR)
 	mkdir -p $(RUNDIR)/engines
-	cp -a libmaigre/.libs/libmaigre.so Maigre/Maigre.dll $(RUNDIR)/engines
+	cp -a libmaigre/.libs/libmaigre.so Maigre/Maigre.dll{,.mdb} $(RUNDIR)/engines
 	cp Maigre/gtkrc $(RUNDIR)
-	GTK_PATH=$(RUNDIR) GTK2_RC_FILES=$(RUNDIR)/gtkrc gtk-demo
-
+	GTK_PATH=$(RUNDIR) GTK2_RC_FILES=$(RUNDIR)/gtkrc $$(which twf 2>/dev/null || gtk-demo)