diff --git a/ChangeLog b/ChangeLog
index df034e61f..2d5341798 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-09-25  Ewald Hew  <ewaldhew@gmail.com>
+
+	[psaux] Extend Adobe interpreter (`closepath').
+
+	* src/psaux/psintrp.c (cf2_interpT2CharString) <c2f_cmdCLOSEPATH>:
+	Use the right builder function.  We can use the `haveWidth' boolean
+	already present, instead of implementing `parse_state'.
+
 2017-09-25  Ewald Hew  <ewaldhew@gmail.com>
 
 	[psaux] Add Type 1 operations to Adobe CFF interpreter.
diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c
index 133c3bcaa..7132ae8be 100644
--- a/src/psaux/psintrp.c
+++ b/src/psaux/psintrp.c
@@ -926,11 +926,9 @@
           FT_TRACE4(( " closepath" ));
 
           /* if there is no path, `closepath' is a no-op */
-          if ( builder->parse_state == T1_Parse_Have_Path   ||
-               builder->parse_state == T1_Parse_Have_Moveto )
-            t1_builder_close_contour( builder );
+          ps_builder_close_contour( &decoder->builder );
 
-          builder->parse_state = T1_Parse_Have_Width;
+          haveWidth = TRUE;
         }
         break;