diff --git a/misc/nsis/ioquake3.nsi.in b/misc/nsis/ioquake3.nsi.in
index cdbfd294..59f66503 100644
--- a/misc/nsis/ioquake3.nsi.in
+++ b/misc/nsis/ioquake3.nsi.in
@@ -59,6 +59,7 @@ Section "ioquake3 (required)"
   File "../../COPYING.txt"
   File "../../README.txt"
   File "../../id-readme.txt"
+  File "../../voip-readme.txt"
 
   SetOutPath "$INSTDIR\baseq3"
   File "../../build/release-mingw32-x86/baseq3/cgamex86.dll"
@@ -129,6 +130,7 @@ Section "Uninstall"
   Delete $INSTDIR\COPYING.txt
   Delete $INSTDIR\README.txt
   Delete $INSTDIR\id-readme.txt
+  Delete $INSTDIR\voip-readme.txt
 
   Delete $INSTDIR\SDL.dll
 
@@ -137,7 +139,8 @@ Section "Uninstall"
   Delete $INSTDIR\uninstall.exe
 
   ; Remove shortcuts, if any
-  Delete "$SMPROGRAMS\ioquake3\*.lnk"
+  Delete "$SMPROGRAMS\ioquake3\Uninstall.lnk"
+  Delete "$SMPROGRAMS\ioquake3\ioquake3.lnk"
 
   ; Remove directories used
   RMDir "$SMPROGRAMS\ioquake3"
diff --git a/misc/setup/doit b/misc/setup/doit
index be5a2791..d5141abf 100755
--- a/misc/setup/doit
+++ b/misc/setup/doit
@@ -102,6 +102,7 @@ install -m 755 /usr/bin/xdg-desktop-menu image/xdg-desktop-menu
 install -m 644 ioquake3.desktop image/ioquake3.desktop.in
 
 ### README, COPYING and EULA
+install -m 644 $topdir/voip-readme.txt image/voip-readme.txt
 install -m 644 $topdir/README image/README
 install -m 644 $topdir/COPYING.txt image/COPYING
 
diff --git a/misc/setup/setup.xml.in b/misc/setup/setup.xml.in
index a74cb982..727c6d14 100644
--- a/misc/setup/setup.xml.in
+++ b/misc/setup/setup.xml.in
@@ -59,6 +59,7 @@ ifelse(HAVE_PPC,yes,dnl
       <files>
 	quake3.png
 	COPYING
+	voip-readme.txt
       </files>
     </option>
   </component>