diff --git a/.travis.yml b/.travis.yml
index f5bb3b1f8c..42c48a36de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,8 @@ script:
   - grep -q -- "-DDYNAMIC_PYTHON3_DLL=\\\\\"$vi_cv_dll_name_python3\\\\\"" src/auto/config.mk
   - make -j$NPROC
   - BINPATH=src/MacVim/build/Release/MacVim.app/Contents/MacOS
-  - cp -a src/MacVim/mvim $BINPATH
+  - sed -e 's/^# VIM_APP_DIR=.*/VIM_APP_DIR=`dirname "$0"`\/..\/..\/../' src/MacVim/mvim > $BINPATH/mvim
+  - chmod 755 $BINPATH/mvim
   - (cd $BINPATH; for f in vimdiff view gvim gvimdiff gview mvimdiff mview; do ln -s mvim $f; done)
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "lua print(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "perl VIM::Msg(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
diff --git a/src/Makefile b/src/Makefile
index d5076ecf30..847e886b1f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3363,8 +3363,7 @@ macvim: $(VIMTARGET)
 
 macvim-dmg: macvim
 	mkdir -p $(DMGDIR)
-	cp MacVim/mvim $(DMGDIR)/
-	cp -r $(RELEASEDIR)/MacVim.app $(DMGDIR)/
+	cp -a $(RELEASEDIR)/MacVim.app $(DMGDIR)/
 	rm -rf $(RELEASEDIR)/$(DMGFILE)
 	create-dmg/create-dmg \
 		--volname "MacVim" \
@@ -3373,7 +3372,6 @@ macvim-dmg: macvim
 		--window-size 650 470 \
 		--icon-size 80 \
 		--icon MacVim.app 240 320 \
-		--icon mvim 570 80 \
 		--app-drop-link 410 320 \
 		$(RELEASEDIR)/$(DMGFILE) $(DMGDIR)