diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt
index 1948958bec32f8bb981ed91d9c751e45252ba473..443c02aa3fcf816b47f2b32a5046e3a36deeee6a 100644
--- a/moose-core/CMakeLists.txt
+++ b/moose-core/CMakeLists.txt
@@ -219,8 +219,15 @@ endif(NOT HDF5_FOUND)
 
 if(HDF5_FOUND)
     add_definitions( -DUSE_HDF5 )
+    # Latest cmake could not find libhdf5_hl.a libraries despite of setting
+    # USE_HDF5_STATIC_LIBRARIES.
+    if(USE_HDF5_STATIC_LIBRARIES AND $ENV{HDF5_ROOT})
+        find_library(HDF5_CXX_LIBRARIES libhdf5.a PATHS $ENV{HDF5_ROOT})
+        find_library(HDF5_HL_LIBRARIES libhdf5_hl.a PATHS $ENV{HDF5_ROOT})
+    endif(USE_HDF5_STATIC_LIBRARIES)
+    
     include_directories( ${HDF5_INCLUDE_DIRS} )
-    foreach(HDF5_LIB ${HDF5_LIBRARIES} )
+    foreach(HDF5_LIB ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES} )
         if(HDF5_LIB)
             get_filename_component( HDF5_LIB_EXT ${HDF5_LIB} EXT )
             if(HDF5_LIB_EXT)
diff --git a/moose-core/VERSION b/moose-core/VERSION
index 50e47c89cafc3ec95774b3110a3dba45256d0b24..753fb504c3f3c2d74abe31dd55b4eafc8f27922d 100644
--- a/moose-core/VERSION
+++ b/moose-core/VERSION
@@ -1 +1 @@
-3.1.1
\ No newline at end of file
+3.1.1-55-g1cd7d7e
\ No newline at end of file