diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index bd464154bd..e63e5bf1d2 100755
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -10,6 +10,7 @@
 #   WINDOWS - Windows
 
 set(NDTARGET_ARCH "x86" CACHE STRING "Build 64 or 32 bit viewer. Defaults to 32 bit.")
+set(ND_USE_OPENJPEG2 OFF CACHE BOOL "Use OpenJPEG 2.1 instead of 1.4. Default off.")
 
 if( ${NDTARGET_ARCH} STREQUAL "x64" )
   set( ND_BUILD64BIT_ARCH ON )
diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py
index 64330b24e8..0c85bc475a 100755
--- a/scripts/packages-formatter.py
+++ b/scripts/packages-formatter.py
@@ -30,7 +30,7 @@ import errno
 import re
 import subprocess
 
-_autobuild=os.getenv('AUTOBUILD', 'autobuild')
+_autobuild=os.getenv('AUTOBUILD', 'autobuild.cmd')
 
 pkg_line=re.compile('^([\w-]+):\s+(.*)$')