diff --git a/inst.nsi b/inst.nsi
index f48ffa8c58444e06727d4dd18cef53c52fa800fe..04b45ea76d6e849c01521d348390baf932e12f1c 100644
--- a/inst.nsi
+++ b/inst.nsi
@@ -825,6 +825,11 @@ Section "-gnupginst"
   File /r "${VSNFD_CFG_SOURCE}\etc"
   SetOverwrite lastused
 
+  #---------------------------------------------------
+  # Create the menu entries for VSD-Docs
+  #---------------------------------------------------
+  CreateShortCut "$SMPROGRAMS\GnuPG Doc.lnk" "${VSNFD_CFG_TARGET}\etc\gnupg\doc" "" "${VSNFD_CFG_TARGET}\Icon.ico"
+
 SectionEnd
 
 LangString DESC_Menu_gnupg_readme ${LANG_ENGLISH} \
@@ -1678,6 +1683,19 @@ Section "-un.gnupginst"
   RMDir "$INSTDIR\etc"
   RMDir "$INSTDIR"
 
+  # Remove global central config
+  # ${VSNFD_CFG_TARGET} is: "$COMMONPROGRAMDATA\GNU"
+
+  ifFileExists "${VSNFD_CFG_TARGET}\etc\*.*"  0 no_rmetc
+    RMDir /r "${VSNFD_CFG_TARGET}"
+
+    #---------------------------------------------------
+    # Temove the menu entries for VSD-Docs
+    #---------------------------------------------------
+    Delete "$SMPROGRAMS\GnuPG Doc.lnk"
+
+  no_rmetc:
+
   # Clean the registry.
   DeleteRegValue SHCTX "Software\GNU\GnuPG" "Install Directory"
 SectionEnd