diff --git a/ChangeLog b/ChangeLog
index dfa41cd..3550817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@ Changes in version 1.9.1
   * templates/library - Davide Madrisan:
     Update template.
 
++ bugfix
+  * pck-update - Davide Madrisan:
+    Fix expansion of templates containing '@configure@' or a line starting by
+    '@configure@'.
+
 --------------------------------------------------------------------------------
 
 Changes in version 1.9.0 - Silvan Birthday Release
diff --git a/plugins/spec-create.in b/plugins/spec-create.in
index f510a80..618a9b4 100644
--- a/plugins/spec-create.in
+++ b/plugins/spec-create.in
@@ -383,7 +383,8 @@ $spec_type ("$"line""#$template_linenum): "$"@fi without @if statement"
 $FUNCNAME: @fi:$currvar lev:$if_level val:${if_value[$if_level]})"
          continue
       ;;
-      @configure@)
+      @configure@*)
+         [ "${if_value[1]}" = '1' -a ${if_value[2]} = '1' ] || continue
          [ "$spec_cmd_configure" ] && echo "$line" | \
             sed "s,@configure@,$spec_cmd_configure,"
       ;;