diff --git a/src/WindowsInstaller/lang/arabic.nsh b/src/WindowsInstaller/lang/arabic.nsh
index a97346e770..f7771f51af 100644
--- a/src/WindowsInstaller/lang/arabic.nsh
+++ b/src/WindowsInstaller/lang/arabic.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "هذا المساعد سوف يرشدك خلال
 #${LangFileString} TEXT_CONFIGURE_PYTHON "بناء سكربتات بايثون..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "إنشاء اختصار سطح المكتب"
-${LangFileString} TEXT_FINISH_WEBSITE "زيارة freecadweb.org لمشاهدة آخر الاخبار, الدعم والأفكار"
+${LangFileString} TEXT_FINISH_WEBSITE "زيارة freecad.org لمشاهدة آخر الاخبار, الدعم والأفكار"
 
 #${LangFileString} FileTypeTitle "مستند - ليك"
 
diff --git a/src/WindowsInstaller/lang/basque.nsh b/src/WindowsInstaller/lang/basque.nsh
index 981d11bf20..7f4bfe2c86 100644
--- a/src/WindowsInstaller/lang/basque.nsh
+++ b/src/WindowsInstaller/lang/basque.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Morroi honek $(^NameDA) aplikazioaren instalazio
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Python script-ak konpilatzen..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Sortu mahaigaineko lasterbidea"
-${LangFileString} TEXT_FINISH_WEBSITE "Bisitatu freecadweb.org azken berriak, aholkuak eta laguntza lortzeko"
+${LangFileString} TEXT_FINISH_WEBSITE "Bisitatu freecad.org azken berriak, aholkuak eta laguntza lortzeko"
 
 #${LangFileString} FileTypeTitle "FreeCAD-dokumentua"
 
diff --git a/src/WindowsInstaller/lang/catalan.nsh b/src/WindowsInstaller/lang/catalan.nsh
index 12a77adc31..2c9c5d32dc 100644
--- a/src/WindowsInstaller/lang/catalan.nsh
+++ b/src/WindowsInstaller/lang/catalan.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Aquest assistent us guiarà en la instal·lació
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
-${LangFileString} TEXT_FINISH_WEBSITE "Visit freecadweb.org for the latest news, support and tips"
+${LangFileString} TEXT_FINISH_WEBSITE "Visit freecad.org for the latest news, support and tips"
 
 #${LangFileString} FileTypeTitle "Document FreeCAD"
 
diff --git a/src/WindowsInstaller/lang/czech.nsh b/src/WindowsInstaller/lang/czech.nsh
index 807cf7c82e..399945e327 100644
--- a/src/WindowsInstaller/lang/czech.nsh
+++ b/src/WindowsInstaller/lang/czech.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Tento pomocník vás provede instalací FreeCADu
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
-${LangFileString} TEXT_FINISH_WEBSITE "Visit freecadweb.org for the latest news, support and tips"
+${LangFileString} TEXT_FINISH_WEBSITE "Visit freecad.org for the latest news, support and tips"
 
 #${LangFileString} FileTypeTitle "FreeCAD-dokumentů"
 
diff --git a/src/WindowsInstaller/lang/danish.nsh b/src/WindowsInstaller/lang/danish.nsh
index 9c43044e6f..9ef681a349 100644
--- a/src/WindowsInstaller/lang/danish.nsh
+++ b/src/WindowsInstaller/lang/danish.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Denne guide vil installere FreeCAD på din compu
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
-${LangFileString} TEXT_FINISH_WEBSITE "Visit freecadweb.org for the latest news, support and tips"
+${LangFileString} TEXT_FINISH_WEBSITE "Visit freecad.org for the latest news, support and tips"
 
 #${LangFileString} FileTypeTitle "FreeCAD-Dokument"
 
diff --git a/src/WindowsInstaller/lang/italian.nsh b/src/WindowsInstaller/lang/italian.nsh
index 589ac1e945..4eff2860c0 100644
--- a/src/WindowsInstaller/lang/italian.nsh
+++ b/src/WindowsInstaller/lang/italian.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Verrete guidati nell'installazione di $(^NameDA)
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Compilazione degli script Python in corso..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Crea icona sul desktop"
-${LangFileString} TEXT_FINISH_WEBSITE "Visitate freecadweb.org per ultime novità, aiuto e suggerimenti"
+${LangFileString} TEXT_FINISH_WEBSITE "Visitate freecad.org per ultime novità, aiuto e suggerimenti"
 
 #${LangFileString} FileTypeTitle "Documento di FreeCAD"
 
diff --git a/src/WindowsInstaller/lang/japanese.nsh b/src/WindowsInstaller/lang/japanese.nsh
index b973095539..7320c9cfdc 100644
--- a/src/WindowsInstaller/lang/japanese.nsh
+++ b/src/WindowsInstaller/lang/japanese.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "このウィザードが、あなたのFreeCAD
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Pythonスクリプトをコンパイルしています..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "デスクトップにショートカットを作成する"
-${LangFileString} TEXT_FINISH_WEBSITE "freecadweb.orgを開いて最新ニュースやサポート、ヒントなどを入手する"
+${LangFileString} TEXT_FINISH_WEBSITE "freecad.orgを開いて最新ニュースやサポート、ヒントなどを入手する"
 
 #${LangFileString} FileTypeTitle "FreeCAD文書"
 
diff --git a/src/WindowsInstaller/lang/norwegian.nsh b/src/WindowsInstaller/lang/norwegian.nsh
index 6069b9278f..2e3293b4f1 100644
--- a/src/WindowsInstaller/lang/norwegian.nsh
+++ b/src/WindowsInstaller/lang/norwegian.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Denne veiviseren installerer FreeCAD på datamas
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilerer Python script..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Lager snarveg på skrivebordet"
-${LangFileString} TEXT_FINISH_WEBSITE "Besøk freecadweb.org for de seneste nyhetene, hjelp og støtte"
+${LangFileString} TEXT_FINISH_WEBSITE "Besøk freecad.org for de seneste nyhetene, hjelp og støtte"
 
 #${LangFileString} FileTypeTitle "FreeCAD-dokument"
 
diff --git a/src/WindowsInstaller/lang/polish.nsh b/src/WindowsInstaller/lang/polish.nsh
index 861959f5a4..8e9ad43d90 100644
--- a/src/WindowsInstaller/lang/polish.nsh
+++ b/src/WindowsInstaller/lang/polish.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Kreator przeprowadzi Ciebie przez proces instala
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilowanie skryptów Python..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Utwórz skrót na pulpicie"
-${LangFileString} TEXT_FINISH_WEBSITE "Odwiedź freecadweb.org by poznać wiadomości i wskazówki lub skorzystać ze wsparcia"
+${LangFileString} TEXT_FINISH_WEBSITE "Odwiedź freecad.org by poznać wiadomości i wskazówki lub skorzystać ze wsparcia"
 
 #${LangFileString} FileTypeTitle "Dokument FreeCAD"
 
diff --git a/src/WindowsInstaller/lang/portuguese.nsh b/src/WindowsInstaller/lang/portuguese.nsh
index df7aa3fbb5..24757e9b59 100644
--- a/src/WindowsInstaller/lang/portuguese.nsh
+++ b/src/WindowsInstaller/lang/portuguese.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Este assistente de instalação irá guiá-lo at
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Compilando os scripts de Python..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Criar um atalho no ambiente de trabalho"
-${LangFileString} TEXT_FINISH_WEBSITE "Visite freecadweb.org para as últimas notícias, suporte e dicas"
+${LangFileString} TEXT_FINISH_WEBSITE "Visite freecad.org para as últimas notícias, suporte e dicas"
 
 #${LangFileString} FileTypeTitle "Documento FreeCAD"
 
diff --git a/src/WindowsInstaller/lang/portugueseBR.nsh b/src/WindowsInstaller/lang/portugueseBR.nsh
index b2925508e4..2658c70d98 100644
--- a/src/WindowsInstaller/lang/portugueseBR.nsh
+++ b/src/WindowsInstaller/lang/portugueseBR.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Este assistente guiará você durante a instala
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Compilando scripts Python..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Criar atalho na área de trabalho"
-${LangFileString} TEXT_FINISH_WEBSITE "Visite freecadweb.org para ver as últimas novidades do FreeCAD!"
+${LangFileString} TEXT_FINISH_WEBSITE "Visite freecad.org para ver as últimas novidades do FreeCAD!"
 
 #${LangFileString} FileTypeTitle "Documento-FreeCAD"
 
diff --git a/src/WindowsInstaller/lang/romanian.nsh b/src/WindowsInstaller/lang/romanian.nsh
index c95950fe2c..2dadf8a9c5 100644
--- a/src/WindowsInstaller/lang/romanian.nsh
+++ b/src/WindowsInstaller/lang/romanian.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Acest asistent vă va ghida în procesul de inst
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
-${LangFileString} TEXT_FINISH_WEBSITE "Visit freecadweb.org for the latest news, support and tips"
+${LangFileString} TEXT_FINISH_WEBSITE "Visit freecad.org for the latest news, support and tips"
 
 #${LangFileString} FileTypeTitle "Document FreeCAD"
 
diff --git a/src/WindowsInstaller/lang/russian.nsh b/src/WindowsInstaller/lang/russian.nsh
index 92cc4169fd..879ebce14f 100644
--- a/src/WindowsInstaller/lang/russian.nsh
+++ b/src/WindowsInstaller/lang/russian.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Этот мастер проведет вас ч
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Компиляция скриптов Python..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Создать ярлык на рабочем столе"
-${LangFileString} TEXT_FINISH_WEBSITE "Перейти на freecadweb.org за новостями, поддержкой и советами"
+${LangFileString} TEXT_FINISH_WEBSITE "Перейти на freecad.org за новостями, поддержкой и советами"
 
 #${LangFileString} FileTypeTitle "FreeCAD-Document"
 
diff --git a/src/WindowsInstaller/lang/slovak.nsh b/src/WindowsInstaller/lang/slovak.nsh
index 14e0aef61e..910538a125 100644
--- a/src/WindowsInstaller/lang/slovak.nsh
+++ b/src/WindowsInstaller/lang/slovak.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Tento sprievodca Vám pomáha inštalovať FreeC
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilácia Python skriptov..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Vytvoriť skratku pre pracovnú plochu"
-${LangFileString} TEXT_FINISH_WEBSITE "Navštívte freecadweb.org pre posledné novinky, podporu a tipy"
+${LangFileString} TEXT_FINISH_WEBSITE "Navštívte freecad.org pre posledné novinky, podporu a tipy"
 
 #${LangFileString} FileTypeTitle "FreeCAD dokument"
 
diff --git a/src/WindowsInstaller/lang/spanish.nsh b/src/WindowsInstaller/lang/spanish.nsh
index eb6c5a2079..3540bf480b 100644
--- a/src/WindowsInstaller/lang/spanish.nsh
+++ b/src/WindowsInstaller/lang/spanish.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Este programa instalará FreeCAD en su ordenador
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Compilando guiones Python..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Crear acceso directo en el escritorio"
-${LangFileString} TEXT_FINISH_WEBSITE "Visite freecadweb.org para últimas noticias, ayuda y consejos"
+${LangFileString} TEXT_FINISH_WEBSITE "Visite freecad.org para últimas noticias, ayuda y consejos"
 
 #${LangFileString} FileTypeTitle "Documento FreeCAD"
 
diff --git a/src/WindowsInstaller/lang/swedish.nsh b/src/WindowsInstaller/lang/swedish.nsh
index 22bb333d20..0176d07b3f 100644
--- a/src/WindowsInstaller/lang/swedish.nsh
+++ b/src/WindowsInstaller/lang/swedish.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Denna guide tar dig igenom installationen av $(^
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilerar Pythonskript..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Skapa skrivbordsgenväg"
-${LangFileString} TEXT_FINISH_WEBSITE "Besök freecadweb.org för de senaste nyheterna, support och tips"
+${LangFileString} TEXT_FINISH_WEBSITE "Besök freecad.org för de senaste nyheterna, support och tips"
 
 #${LangFileString} FileTypeTitle "FreeCAD-dokument"
 
diff --git a/src/WindowsInstaller/lang/turkish.nsh b/src/WindowsInstaller/lang/turkish.nsh
index dd1511abcf..12f4eedab2 100644
--- a/src/WindowsInstaller/lang/turkish.nsh
+++ b/src/WindowsInstaller/lang/turkish.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "Bu sihirbaz size FreeCAD programını kuracak.$\
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
-${LangFileString} TEXT_FINISH_WEBSITE "Visit freecadweb.org for the latest news, support and tips"
+${LangFileString} TEXT_FINISH_WEBSITE "Visit freecad.org for the latest news, support and tips"
 
 #${LangFileString} FileTypeTitle "FreeCAD-Document"
 
diff --git a/src/WindowsInstaller/lang/ukrainian.nsh b/src/WindowsInstaller/lang/ukrainian.nsh
index d1e4f975f2..fac5191ab4 100644
--- a/src/WindowsInstaller/lang/ukrainian.nsh
+++ b/src/WindowsInstaller/lang/ukrainian.nsh
@@ -14,7 +14,7 @@ ${LangFileString} TEXT_WELCOME "За допомогою цього майстр
 #${LangFileString} TEXT_CONFIGURE_PYTHON "Обробка скриптів Python..."
 
 ${LangFileString} TEXT_FINISH_DESKTOP "Створити значок на стільниці"
-${LangFileString} TEXT_FINISH_WEBSITE "Відвідати freecadweb.org, щоб ознайомитися з новинами, довідковими матеріалами та підказками"
+${LangFileString} TEXT_FINISH_WEBSITE "Відвідати freecad.org, щоб ознайомитися з новинами, довідковими матеріалами та підказками"
 
 #${LangFileString} FileTypeTitle "Документ FreeCAD"
 
diff --git a/src/WindowsInstaller/setup/configure.nsh b/src/WindowsInstaller/setup/configure.nsh
index dae07512f0..d42ef4d6bb 100644
--- a/src/WindowsInstaller/setup/configure.nsh
+++ b/src/WindowsInstaller/setup/configure.nsh
@@ -45,9 +45,9 @@ Section -InstallData
   WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\${APP_RUN}"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "${APP_WEBPAGE}"
-  WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout" "https://www.freecadweb.org/"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout" "https://www.freecad.org/"
   WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "${APP_NAME} Team"
-  WriteRegStr SHCTX ${APP_UNINST_KEY} "HelpLink" "https://forum.freecadweb.org/"
+  WriteRegStr SHCTX ${APP_UNINST_KEY} "HelpLink" "https://forum.freecad.org/"
   WriteRegDWORD SHCTX ${APP_UNINST_KEY} "NoModify" 0x00000001
   WriteRegDWORD SHCTX ${APP_UNINST_KEY} "NoRepair" 0x00000001
   WriteRegStr SHCTX ${APP_UNINST_KEY} "StartMenu" "$SMPROGRAMS\$StartmenuFolder"