diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 9df705d0e..119602605 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -21,6 +21,7 @@
  - fixed #11059: WebGUI upgrade packages do not overwrite versions in the db
  - fixed #11064: spelling error
  - fixed #11062: subscriptionCode
+ - fixed #11061: SQLForm_fieldOrder
 
 7.8.0
  - upgraded YUI to 2.8.0r4
@@ -83,6 +84,7 @@
  - fixed #11008: Test::Class
  - fixed #10990: Survey: View Transposed Results not working
  - fixed #11022: Deleting user shows "TRUE" prompt
+ - fixed 
 
 7.7.19
  - fixed #10838: Forwarded forum post email to new CS adds reply to original thread
diff --git a/docs/upgrades/upgrade_7.8.0-7.8.1.pl b/docs/upgrades/upgrade_7.8.0-7.8.1.pl
index 4694c4dec..a4cce2523 100644
--- a/docs/upgrades/upgrade_7.8.0-7.8.1.pl
+++ b/docs/upgrades/upgrade_7.8.0-7.8.1.pl
@@ -33,6 +33,7 @@ my $session = start(); # this line required
 fixWikis( $session );
 fixEMSTemplates( $session );
 removeOldSubscriptionTables( $session );
+removeSQLFormTables( $session );
 
 finish($session); # this line required
 
@@ -46,6 +47,18 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+# Describe what our function does
+sub removeSQLFormTables {
+    my $session = shift;
+    print "\tRemoving leftover SQL Form tables if not used... " unless $quiet;
+    my $tablesUsed = $session->db->quickScalar("select count(*) from asset where className='WebGUI::Asset::Wobject::SQLForm'");
+    if (!$tablesUsed) {
+        $session->db->write('DROP TABLE IF EXISTS SQLForm_fieldOrder');
+        print "\n\t\tSQL Form not used, dropping table...";
+    }
+    print "Done.\n" unless $quiet;
+}
+
 # Describe what our function does
 sub removeOldSubscriptionTables {
     my $session = shift;