diff --git a/CHANGES.txt b/CHANGES.txt
index 6b918a37c30..6a64eaa7eb2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -51,6 +51,8 @@ Bug Fixes
  3. Added empty extractTerms() to FunctionQuery to enable use in
     a MultiSearcher (Yonik)
  4. WordDelimiterFilter sometimes lost token positionIncrement information
+ 5. Fix reverse sorting for fields were sortMissingFirst=true
+    (Rob Staveley, yonik)
 
 Other Changes
  1. Upgrade to Lucene 2.0 nightly build 2006-06-22, lucene SVN revision 416224,
diff --git a/src/java/org/apache/solr/search/Sorting.java b/src/java/org/apache/solr/search/Sorting.java
index b4252f568f2..cbacf7846ed 100644
--- a/src/java/org/apache/solr/search/Sorting.java
+++ b/src/java/org/apache/solr/search/Sorting.java
@@ -44,7 +44,7 @@ public class Sorting {
       if (!reverse) return new SortField(fieldName, nullStringLastComparatorSource);
       else return new SortField(fieldName, SortField.STRING, true);
     } else if (nullFirst) {
-      if (reverse) return new SortField(fieldName, nullStringLastComparatorSource);
+      if (reverse) return new SortField(fieldName, nullStringLastComparatorSource, true);
       else return new SortField(fieldName, SortField.STRING, false);
     } else {
       return new SortField(fieldName, SortField.STRING, reverse);
diff --git a/src/test/test-files/solr/conf/schema.xml b/src/test/test-files/solr/conf/schema.xml
index d6ad901e738..5860dd1c1a6 100644
--- a/src/test/test-files/solr/conf/schema.xml
+++ b/src/test/test-files/solr/conf/schema.xml
@@ -311,6 +311,7 @@
    <field name="lengthfilt" type="lengthfilt" indexed="true" stored="true"/>
    <field name="dedup" type="dedup" indexed="true" stored="true"/>
 
+   <field name="nullfirst" type="string" indexed="true" stored="true" sortMissingFirst="true"/>
 
    <field name="subword" type="subword" indexed="true" stored="true"/>
    <field name="sku1" type="skutype1" indexed="true" stored="true"/>