diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index a4d43bc835..2271fd6976 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -278,6 +278,8 @@ class Keg
       when 'charset.alias' then :skip_file
       # pkg-config database gets explicitly created
       when 'pkgconfig' then :mkpath
+      # cmake database gets explicitly created
+      when 'cmake' then :mkpath
       # lib/language folders also get explicitly created
       when 'dtrace' then :mkpath
       when /^gdk-pixbuf/ then :mkpath
diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb
index 0fb419f0d2..28cadf1c47 100644
--- a/Library/Homebrew/test/test_keg.rb
+++ b/Library/Homebrew/test/test_keg.rb
@@ -207,6 +207,13 @@ class LinkTests < Homebrew::TestCase
     assert_predicate link.lstat, :directory?
   end
 
+  def test_cmake_is_mkpathed
+    link = HOMEBREW_PREFIX.join("lib", "cmake")
+    @keg.join("lib", "cmake").mkpath
+    @keg.link
+    assert_predicate link.lstat, :directory?
+  end
+
   def test_symlinks_are_linked_directly
     link = HOMEBREW_PREFIX.join("lib", "pkgconfig")