diff --git a/common/design_block_io.cpp b/common/design_block_io.cpp
index a6d94cfa52..18f6bb69fc 100644
--- a/common/design_block_io.cpp
+++ b/common/design_block_io.cpp
@@ -22,6 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <common.h>
 #include <i18n_utility.h>
 #include <wx/dir.h>
 #include <wx/filename.h>
@@ -136,12 +137,9 @@ const DESIGN_BLOCK_IO::IO_FILE_DESC DESIGN_BLOCK_IO::GetLibraryDesc() const
 
 long long DESIGN_BLOCK_IO::GetLibraryTimestamp( const wxString& aLibraryPath ) const
 {
-    wxFileName fn( aLibraryPath );
+    wxString fileSpec = wxT( "*." ) + wxString( FILEEXT::KiCadDesignBlockPathExtension );
 
-    if( fn.IsFileReadable() && fn.GetModificationTime().IsValid() )
-        return fn.GetModificationTime().GetValue().GetValue();
-    else
-        return wxDateTime( 0.0 ).GetValue().GetValue();
+    return TimestampDir( aLibraryPath, fileSpec );
 }
 
 
diff --git a/eeschema/design_block_utils.cpp b/eeschema/design_block_utils.cpp
index a834a8f159..f2ebbf6b07 100644
--- a/eeschema/design_block_utils.cpp
+++ b/eeschema/design_block_utils.cpp
@@ -202,9 +202,9 @@ bool SCH_EDIT_FRAME::AddDesignBlockLibrary( const wxString&         aFilename,
 
     if( aFilename.IsEmpty() )
     {
-        if( !LibraryFileBrowser( true, fn, FILEEXT::KiCadFootprintLibPathWildcard(),
-                                 FILEEXT::KiCadFootprintLibPathExtension, true, isGlobal,
-                                 PATHS::GetDefaultUserFootprintsPath() ) )
+        if( !LibraryFileBrowser( true, fn, FILEEXT::KiCadDesignBlockLibPathWildcard(),
+                                 FILEEXT::KiCadDesignBlockLibPathExtension, true, isGlobal,
+                                 PATHS::GetDefaultUserDesignBlocksPath() ) )
         {
             return false;
         }