diff --git a/recipe/bld.bat b/recipe/bld.bat
index 546e5dfa..45c9c4b7 100644
--- a/recipe/bld.bat
+++ b/recipe/bld.bat
@@ -1,17 +1,28 @@
 mkdir build
 cd build
 
-REM set environement variables
+:: Set environment variables.
 set HDF5_EXT_ZLIB=zlib.lib
 
-REM configure step
-cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE:STRING=RELEASE -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% -DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% -DHDF5_BUILD_CPP_LIB=ON -DBUILD_SHARED_LIBS:BOOL=ON -DHDF5_BUILD_HL_LIB=ON -DHDF5_BUILD_TOOLS:BOOL=ON -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON %SRC_DIR%
+:: Configure step.
+cmake -G "NMake Makefiles" ^
+      -D CMAKE_BUILD_TYPE:STRING=RELEASE ^
+      -D CMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
+      -D CMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% ^
+      -D HDF5_BUILD_CPP_LIB=ON ^
+      -D BUILD_SHARED_LIBS:BOOL=ON ^
+      -D HDF5_BUILD_HL_LIB=ON ^
+      -D HDF5_BUILD_TOOLS:BOOL=ON ^
+      -D HDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON ^
+      -D HDF5_ENABLE_THREADSAFE=ON ^
+      -D ALLOW_UNSUPPORTED=ON ^
+      %SRC_DIR%
 if errorlevel 1 exit 1
 
-REM Build C libraries and tools
+:: Build C libraries and tools.
 nmake
 if errorlevel 1 exit 1
 
-REM Install step
+:: Install step.
 nmake install
 if errorlevel 1 exit 1
diff --git a/recipe/build.sh b/recipe/build.sh
index 439fcee3..5bfd6d75 100755
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -1,15 +1,6 @@
 #!/bin/bash
 
-# FIXME: This is a hack to make sure the environment is activated.
-# The reason this is required is due to the conda-build issue
-# mentioned below.
-#
-# https://github.com/conda/conda-build/issues/910
-#
-source activate "${CONDA_DEFAULT_ENV}"
-
-if [ "$(uname)" == "Darwin" ]
-then
+if [ "$(uname)" == "Darwin" ]; then
     export CXX="${CXX} -stdlib=libc++"
     export LDFLAGS="${LDFLAGS} -Wl,-rpath,$PREFIX/lib"
 fi
@@ -23,8 +14,13 @@ export LIBRARY_PATH="${PREFIX}/lib"
             --enable-cxx \
             --enable-fortran \
             --enable-fortran2003 \
-            --with-default-plugindir="${PREFIX}/lib/hdf5/plugin"
+            --with-default-plugindir="${PREFIX}/lib/hdf5/plugin" \
+            --enable-threadsafe \
+            --enable-production \
+            --enable-unsupported \
+            --with-ssl
 
+#             --disable-static \
 make -j "${CPU_COUNT}"
 make check
 make install
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 6178ef02..c1617235 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -20,7 +20,7 @@ source:
     - test_Makefile.in.patch
 
 build:
-  number: 9
+  number: 10
   skip: True  # [py==36]
   features:
     - vc9     # [win and py27]