diff --git a/README.md b/README.md
index 9bd1d4154..355ae4951 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,12 @@
 
 This allows you to easily build the desktop client for 64-bit and 32-bit Windows.
 
+## Update: 2020-08-21
+
+Build support for NC 3.0:
+- Shell extensions changed by: https://github.com/nextcloud/desktop/pull/2288
+- New client-building branches to ease building: stable-2.5, stable-2.6, stable-3.0
+
 ## Update: 2020-07-22
 
 Upgrade / new default version:
@@ -315,14 +321,11 @@ OR:
   for them or they're critical for security and privacy:
   - all the binaries we produce:
     - nextcloud/ocsync.dll
-    - shellext/OCContextMenu.dll
-    - shellext/OCOverlays.dll
-    - shellext/OCUtil.dll
+    - shellext/NCContextMenu.dll
+    - shellext/NCOverlays.dll
     - nextcloud.exe
     - nextcloudcmd.exe
     - nextcloudsync.dll
-    - OCContextMenu.dll
-    - OCOverlays.dll
     - ocsync.dll
     - OCUtil.dll
     - qt5keychain.dll
diff --git a/nextcloud.nsi b/nextcloud.nsi
index 80b9713dd..99e64735b 100644
--- a/nextcloud.nsi
+++ b/nextcloud.nsi
@@ -453,14 +453,12 @@ SectionEnd
       !define LIBRARY_IGNORE_VERSION
       ${If} ${RunningX64}
          !define LIBRARY_X64
-         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win64\shellext\OCUtil.dll" "$INSTDIR\shellext\OCUtil.dll" "$INSTDIR\shellext"
-         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win64\shellext\OCOverlays.dll" "$INSTDIR\shellext\OCOverlays.dll" "$INSTDIR\shellext"
-         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win64\shellext\OCContextMenu.dll" "$INSTDIR\shellext\OCContextMenu.dll" "$INSTDIR\shellext"
+         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win64\shellext\NCOverlays.dll" "$INSTDIR\shellext\NCOverlays.dll" "$INSTDIR\shellext"
+         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win64\shellext\NCContextMenu.dll" "$INSTDIR\shellext\NCContextMenu.dll" "$INSTDIR\shellext"
          !undef LIBRARY_X64
      ${Else}
-         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win32\shellext\OCUtil.dll" "$INSTDIR\shellext\OCUtil.dll" "$INSTDIR\shellext"
-         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win32\shellext\OCOverlays.dll" "$INSTDIR\shellext\OCOverlays.dll" "$INSTDIR\shellext"
-         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win32\shellext\OCContextMenu.dll" "$INSTDIR\shellext\OCContextMenu.dll" "$INSTDIR\shellext"
+         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win32\shellext\NCOverlays.dll" "$INSTDIR\shellext\NCOverlays.dll" "$INSTDIR\shellext"
+         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SETUP_COLLECTION_PATH}\Win32\shellext\NCContextMenu.dll" "$INSTDIR\shellext\NCContextMenu.dll" "$INSTDIR\shellext"
       ${Endif}
       !undef LIBRARY_COM
       !undef LIBRARY_SHELL_EXTENSION
@@ -651,14 +649,12 @@ Section Uninstall
       ${If} ${HasSection} SEC_SHELL_EXT
         DetailPrint "Uninstalling x64 overlay DLLs"
         !define LIBRARY_X64
-        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCContextMenu.dll"
-        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCOverlays.dll"
-        !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCUtil.dll"
+        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\NCContextMenu.dll"
+        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\NCOverlays.dll"
         !undef LIBRARY_X64
         DetailPrint "Uninstalling x86 overlay DLLs"
-        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCContextMenu.dll"
-        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCOverlays.dll"
-        !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCUtil.dll"
+        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\NCContextMenu.dll"
+        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\NCOverlays.dll"
       ${EndIf}
       !undef LIBRARY_COM
       !undef LIBRARY_SHELL_EXTENSION
diff --git a/single-build-installer-collect.bat b/single-build-installer-collect.bat
index 800595582..5dc22948f 100644
--- a/single-build-installer-collect.bat
+++ b/single-build-installer-collect.bat
@@ -119,16 +119,12 @@ start "copy ocsync.dll" /D "%MY_COLLECT_PATH%/" /B /wait cp -af "%MY_INSTALL_PAT
 if %ERRORLEVEL% neq 0 goto onError
 
 Rem shell extension dll's for Explorer integration (status icons)
-echo "* copy OCContextMenu.dll to %MY_COLLECT_PATH%/shellext/."
-start "copy OCContextMenu.dll" /D "%MY_COLLECT_PATH%/" /B /wait cp -af "%MY_INSTALL_PATH%/bin/OCContextMenu.dll" "%MY_COLLECT_PATH%/shellext/"
+echo "* move NCContextMenu.dll to %MY_COLLECT_PATH%/shellext/."
+start "move NCContextMenu.dll" /D "%MY_COLLECT_PATH%/" /B /wait mv -f "%MY_COLLECT_PATH%/NCContextMenu.dll" "%MY_COLLECT_PATH%/shellext/"
 if %ERRORLEVEL% neq 0 goto onError
 
-echo "* copy OCContextMenu.dll to %MY_COLLECT_PATH%/shellext/."
-start "copy OCOverlays.dll" /D "%MY_COLLECT_PATH%/" /B /wait cp -af "%MY_INSTALL_PATH%/bin/OCOverlays.dll" "%MY_COLLECT_PATH%/shellext/"
-if %ERRORLEVEL% neq 0 goto onError
-
-echo "* copy OCUtil.dll to %MY_COLLECT_PATH%/shellext/."
-start "copy OCUtil.dll" /D "%MY_COLLECT_PATH%/" /B /wait cp -af "%MY_INSTALL_PATH%/bin/OCUtil.dll" "%MY_COLLECT_PATH%/shellext/"
+echo "* move NCOverlays.dll to %MY_COLLECT_PATH%/shellext/."
+start "move NCOverlays.dll" /D "%MY_COLLECT_PATH%/" /B /wait mv -f "%MY_COLLECT_PATH%/NCOverlays.dll" "%MY_COLLECT_PATH%/shellext/"
 if %ERRORLEVEL% neq 0 goto onError
 
 Rem exclude system file list
@@ -221,16 +217,12 @@ if "%USE_CODE_SIGNING%" == "0" (
 
     for %%G in (
             "%APP_NAME_SANITIZED%/ocsync.dll"
-            "shellext/OCContextMenu.dll"
-            "shellext/OCOverlays.dll"
-            "shellext/OCUtil.dll"
+            "shellext/NCContextMenu.dll"
+            "shellext/NCOverlays.dll"
             "%APP_NAME_SANITIZED%.exe"
             "%APP_NAME_SANITIZED%cmd.exe"
             "%APP_NAME_SANITIZED%sync.dll"
-            "OCContextMenu.dll"
-            "OCOverlays.dll"
             "ocsync.dll"
-            "OCUtil.dll"
             "qt5keychain.dll"
             "%LIBCRYPTO_DLL_FILENAME%"
             "%LIBSSL_DLL_FILENAME%"