diff --git a/doc/FAQ.html b/doc/FAQ.html
index 435e20f7..16973a7e 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -34,6 +34,7 @@ a:visited { color: #0000EE; }
How can I use LameXP as a "portable" application?
Is there a way to use custom tools (binaries) with LameXP instead of the "built-in" ones?
The LameXP startup (splash screen) takes very long on my system. What can I do?
+Why is there a time limit in my version of LameXP?
Is there a way to hide/show the LameXP console ("DOS Box") window?
Why does application 'xyz' not open the Wave files created by LameXP?
Why does LameXP run (only) N instances/threads in parallel on my computer?
@@ -422,6 +423,20 @@ the developer of the anti-virus software. And, if they don't fix the problem, sw
+Why is there a time limit in my version of LameXP?
+
+LameXP is free software, released under the GPL. This means that you may use LameXP for free and without any
+restrictions. More specifically, there is NO time limit in "Release" versions of LameXP! Nonetheless, "Beta"
+(pre-release) versions of LameXP are limited to 30 days, starting at the build date. That's because these
+"Beta" versions are intended for testing and evaluation only - they are NOT intended for productive use. Also
+there will be frequent updates for "Beta" versions. Usually a new build will be available even before the
+previous build has expired. So if you are not willing to update regularly, stick with the "Release" version.
+
+Note: We are well aware that the expiration mechanism implemented in LameXP can be circumvented quite easily,
+if you really want to. But implementing a "better" mechanism is pointless for an OpenSource software ;-)
+
+
+
Is there a way to hide/show the LameXP console ("DOS Box") window?
It is common for many people to run an alleged "DOS" program inside Windows, using a so-called "DOS Box".
diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index 36074b80..2b110d2a 100644
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -466,7 +466,7 @@ Section "-Create Shortcuts"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\Changelog.html"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_TRANSLATE).lnk" "$INSTDIR\Translate.html"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_FAQ).lnk" "$INSTDIR\FAQ.html"
- CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_MANUAL).lnk" "$INSTDIR\FAQ.html"
+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_MANUAL).lnk" "$INSTDIR\Manual.html"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_UNINSTALL).lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
!insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\Official LameXP Homepage.url" "http://mulder.dummwiedeutsch.de/"