diff --git a/etc/setup/setup.nsi b/etc/setup/setup.nsi
index ade5b90..bbc9adb 100644
--- a/etc/setup/setup.nsi
+++ b/etc/setup/setup.nsi
@@ -174,7 +174,6 @@ VIAddVersionKey "Website" "${MyWebSite}"
 
 ;Welcome
 !define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfUnattended
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckForPreRelease
 !define MUI_WELCOMEPAGE_TITLE_3LINES
 !define MUI_FINISHPAGE_TITLE_3LINES
 !insertmacro MUI_PAGE_WELCOME
@@ -456,10 +455,16 @@ FunctionEnd
 	EnableWindow ${TmpVar} 0
 !macroend
 
+!macro DisableBackButton TmpVar
+	GetDlgItem ${TmpVar} $HWNDPARENT 3
+	EnableWindow ${TmpVar} 0
+!macroend
+
 !macro CleanUpFiles options
 	Delete ${options} `$INSTDIR\*.exe`
 	Delete ${options} `$INSTDIR\*.dll`
 	Delete ${options} `$INSTDIR\*.txt`
+	Delete ${options} `$INSTDIR\*.htm`
 	Delete ${options} `$INSTDIR\*.html`
 	
 	RMDir /r ${options} `$INSTDIR\toolset`
diff --git a/src/version.h b/src/version.h
index 8bb15b4..c49231f 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 6
 #define VER_X264_PATCH 0
-#define VER_X264_BUILD 970
+#define VER_X264_BUILD 971
 
 #define VER_X264_PORTABLE_EDITION (0)