diff --git a/THANKS b/THANKS
index 2df6763c..4d2b25f7 100644
--- a/THANKS
+++ b/THANKS
@@ -180,6 +180,7 @@ Tobias Frost              tobi@debian.org
 Todd Freed                todd.freed@gmail.com
 Tom Lane                  tgl@sss.pgh.pa.us
 Tom Tromey                tromey@cygnus.com
+Tomasz Kłoczko            kloczko.tomasz@gmail.com
 Tommy Nordgren            tommy.nordgren@chello.se
 Troy A. Johnson           troyj@ecn.purdue.edu
 Tys Lefering              gccbison@gmail.com
diff --git a/src/main.c b/src/main.c
index 3c51eafe..06bcb1c5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -223,7 +223,6 @@ main (int argc, char *argv[])
   muscle_free ();
   code_scanner_free ();
   skel_scanner_free ();
-  quotearg_free ();
   timevar_pop (tv_free);
 
   if (trace_flag & trace_bitsets)
@@ -249,6 +248,7 @@ main (int argc, char *argv[])
   uniqstrs_free ();
 
   complain_free ();
+  quotearg_free ();
 
   return complaint_status ? EXIT_FAILURE : EXIT_SUCCESS;
 }