diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 27add9f73a4..5f9c7a5eb52 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -324,6 +324,8 @@ Other Changes
 
 * SOLR-6309: Increase timeouts for AsyncMigrateRouteKeyTest. (shalin)
 
+* SOLR-2168: Added support for facet.missing in /browse field and pivot faceting. (ehatcher)
+
 ==================  4.9.0 ==================
 
 Versions of Major Components
diff --git a/solr/example/solr/collection1/conf/solrconfig.xml b/solr/example/solr/collection1/conf/solrconfig.xml
index 25a82225e02..2f596ffa8bb 100755
--- a/solr/example/solr/collection1/conf/solrconfig.xml
+++ b/solr/example/solr/collection1/conf/solrconfig.xml
@@ -953,6 +953,7 @@
 
        <!-- Faceting defaults -->
        <str name="facet">on</str>
+       <str name="facet.missing">true</str>
        <str name="facet.field">cat</str>
        <str name="facet.field">manu_exact</str>
        <str name="facet.field">content_type</str>
diff --git a/solr/example/solr/collection1/conf/velocity/VM_global_library.vm b/solr/example/solr/collection1/conf/velocity/VM_global_library.vm
index 5dda07c4e93..76516b7935b 100644
--- a/solr/example/solr/collection1/conf/velocity/VM_global_library.vm
+++ b/solr/example/solr/collection1/conf/velocity/VM_global_library.vm
@@ -46,7 +46,7 @@
 #macro(url_for_nested_facet_query $field)#url_for_home#lens&fq=$esc.url($field)#end
 
 ## TODO: convert to use {!raw f=$field}$value (with escaping of course)
-#macro(url_for_facet_filter $field $value)#url_for_home#lens&fq=$esc.url($field):%22$esc.url($value)%22#end
+#macro(url_for_facet_filter $field $value)#url_for_home#lens&fq=#if($value!=$null)$esc.url($field):%22$esc.url($value)%22#else-$esc.url($field):[*+TO+*]#end#end
 
 #macro(url_for_facet_date_filter $field $value)#url_for_home#lens&fq=$esc.url($field):$esc.url($value)#end
 
@@ -126,10 +126,17 @@
     <ul>
       #foreach ($pivot in $pivots)
         #foreach ($entry in $pivot.value)
-          <a href="#url_for_facet_filter($entry.field, $entry.value)">$entry.field::$entry.value</a> ($entry.count)
+          <a href="#url_for_facet_filter($entry.field, $entry.value)">$entry.field::#if($entry.value!=$null)$entry.value#else<em>missing</em>#end</a> ($entry.count)
           <ul>
             #foreach($nest in $entry.pivot)
-              <a href="#url_for_facet_filter($entry.field, $entry.value)&fq=$esc.url($nest.field):%22$esc.url($nest.value)%22">$nest.field::$nest.value</a> ($nest.count)
+              <li>
+                #if($nest.value != $null)
+                  <a href="#url_for_facet_filter($entry.field, $entry.value)&fq=$esc.url($nest.field):%22$esc.url($nest.value)%22">$nest.field::$nest.value</a>
+                #else
+                  <a href="#url_for_facet_filter($entry.field, $entry.value)&fq=-$esc.url($nest.field):[*+TO+*]">$nest.field::<em>missing</em></a>
+                #end
+                ($nest.count)
+              </li>
             #end
           </ul>
         #end
diff --git a/solr/example/solr/collection1/conf/velocity/facet_fields.vm b/solr/example/solr/collection1/conf/velocity/facet_fields.vm
index d9db659b8d2..57bc210c9d4 100644
--- a/solr/example/solr/collection1/conf/velocity/facet_fields.vm
+++ b/solr/example/solr/collection1/conf/velocity/facet_fields.vm
@@ -13,9 +13,7 @@
       <span class="facet-field">$field.name</span>
       <ul>
         #foreach($facet in $field.values)
-          <li>
-            <a href="#url_for_facet_filter($field.name, $facet.name)">$facet.name</a> ($facet.count)
-          </li>
+          <li><a href="#url_for_facet_filter($field.name, $facet.name)">#if($facet.name!=$null)$facet.name#else<em>missing</em>#end</a> ($facet.count)</li>
         #end
       </ul>
     #end  ## end if > 0