diff --git a/META.json b/META.json
index 5f1c7d8..38c8d1a 100644
--- a/META.json
+++ b/META.json
@@ -4,13 +4,13 @@
       "Noah Petherbridge <kirsle@cpan.org>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.1, CPAN::Meta::Converter version 2.150005",
+   "generated_by" : "ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010",
    "license" : [
       "mit"
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
+      "version" : 2
    },
    "name" : "RiveScript",
    "no_index" : {
@@ -40,5 +40,5 @@
    },
    "release_status" : "stable",
    "version" : "v2.0.3",
-   "x_serialization_backend" : "JSON::PP version 2.27400"
+   "x_serialization_backend" : "JSON::PP version 4.06"
 }
diff --git a/META.yml b/META.yml
index 64c3bfc..6aff194 100644
--- a/META.yml
+++ b/META.yml
@@ -7,7 +7,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: '0'
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.1, CPAN::Meta::Converter version 2.150005'
+generated_by: 'ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010'
 license: mit
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
diff --git a/debian/changelog b/debian/changelog
index 84ea693..caa9437 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-librivescript-perl (2.0.3-2) UNRELEASED; urgency=medium
+librivescript-perl (2.0.3+git20210820.1.2b43e04-1) UNRELEASED; urgency=medium
 
   [ Alex Muntada ]
   * Remove inactive pkg-perl members from Uploaders.
@@ -10,7 +10,10 @@ librivescript-perl (2.0.3-2) UNRELEASED; urgency=medium
   * debian/watch: use uscan version 4.
   * Update lintian overrides for renamed tags.
 
- -- Alex Muntada <alexm@debian.org>  Sun, 08 Oct 2017 17:32:35 +0200
+  [ Debian Janitor ]
+  * New upstream snapshot.
+
+ -- Alex Muntada <alexm@debian.org>  Fri, 18 Mar 2022 09:49:12 -0000
 
 librivescript-perl (2.0.3-1) unstable; urgency=medium
 
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index e9ab41b..4402e56 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -5,9 +5,11 @@ Last-Update: 2016-10-31
 Forwarded: https://rt.cpan.org/Ticket/Display.html?id=118572
 Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
 
---- a/README.md
-+++ b/README.md
-@@ -181,7 +181,7 @@
+Index: librivescript-perl/README.md
+===================================================================
+--- librivescript-perl.orig/README.md
++++ librivescript-perl/README.md
+@@ -181,7 +181,7 @@ http://www.rivescript.com/
            "include" => { # topic inclusion
              "alpha" => [ "beta", "gamma" ], # > topic alpha includes beta gamma
            },
@@ -16,8 +18,10 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
              "alpha" => [ "delta" ], # > topic alpha inherits delta
            }
          }
---- a/docs/RiveScript-WD.html
-+++ b/docs/RiveScript-WD.html
+Index: librivescript-perl/docs/RiveScript-WD.html
+===================================================================
+--- librivescript-perl.orig/docs/RiveScript-WD.html
++++ librivescript-perl/docs/RiveScript-WD.html
 @@ -398,7 +398,7 @@
  
  <p>When a topic inherits another topic, it means that the entire collection of triggers of the source topic <i>and</i> any included topics, will have a higher matching priority than the inherited topics.</p>
@@ -36,8 +40,10 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  
  <pre><code>  &gt; topic ab includes alpha
      + hello bot
---- a/docs/RiveScript.html
-+++ b/docs/RiveScript.html
+Index: librivescript-perl/docs/RiveScript.html
+===================================================================
+--- librivescript-perl.orig/docs/RiveScript.html
++++ librivescript-perl/docs/RiveScript.html
 @@ -202,7 +202,7 @@
      &quot;include&quot; =&gt; { # topic inclusion
        &quot;alpha&quot; =&gt; [ &quot;beta&quot;, &quot;gamma&quot; ], # &gt; topic alpha includes beta gamma
@@ -47,9 +53,11 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
        &quot;alpha&quot; =&gt; [ &quot;delta&quot; ], # &gt; topic alpha inherits delta
      }
    }</code></pre>
---- a/lib/RiveScript.pm
-+++ b/lib/RiveScript.pm
-@@ -1091,7 +1091,7 @@
+Index: librivescript-perl/lib/RiveScript.pm
+===================================================================
+--- librivescript-perl.orig/lib/RiveScript.pm
++++ librivescript-perl/lib/RiveScript.pm
+@@ -1091,7 +1091,7 @@ sub sortReplies {
  			# values mean higher priority on the stack. Keep this in mind when
  			# keeping track of how to sort these things.
  			my $inherits = -1; # -1 means no {inherits} tag, for flexibility
@@ -58,7 +66,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  
  			# Loop through and categorize these triggers.
  			my $track = {
-@@ -1123,7 +1123,7 @@
+@@ -1123,7 +1123,7 @@ sub sortReplies {
  					$inherits = -1;
  				}
  
@@ -67,7 +75,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  				# level, initialize its structure.
  				if (!exists $track->{$inherits}) {
  					$track->{$inherits} = {
-@@ -1430,7 +1430,7 @@
+@@ -1430,7 +1430,7 @@ sub sortList {
  	return 1;
  }
  
@@ -76,7 +84,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  sub _getTopicTree {
  	my ($self,$topic,$depth) = @_;
  
-@@ -1472,7 +1472,7 @@
+@@ -1472,7 +1472,7 @@ sub _getTopicTree {
  # Gather an array of all triggers in a topic. If the topic inherits other
  # topics, recursively collect those triggers too. Take care about recursion.
  sub _topicTriggers {
@@ -85,7 +93,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  
  	# Break if we're in too deep.
  	if ($depth > $self->{depth}) {
-@@ -1480,9 +1480,9 @@
+@@ -1480,9 +1480,9 @@ sub _topicTriggers {
  		return ();
  	}
  
@@ -97,7 +105,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  	#
  	# This way, `> topic alpha includes beta inherits gamma` will have this effect:
  	#   alpha and beta's triggers are combined together into one matching pool, and then
-@@ -1492,7 +1492,7 @@
+@@ -1492,7 +1492,7 @@ sub _topicTriggers {
  	# inherits other topics. This forces the {inherits} tag to be added to the
  	# triggers. This only applies when the top topic "includes" another topic.
  
@@ -106,7 +114,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  
  	# topic:   the name of the topic
  	# triglvl: either $self->{topics} or $self->{thats}
-@@ -1506,7 +1506,7 @@
+@@ -1506,7 +1506,7 @@ sub _topicTriggers {
  		# Check every included topic.
  		foreach my $includes (sort { $a cmp $b } keys %{$self->{includes}->{$topic}}) {
  			$self->debug ("\t\tTopic $topic includes $includes");
@@ -115,7 +123,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  		}
  	}
  
-@@ -1515,7 +1515,7 @@
+@@ -1515,7 +1515,7 @@ sub _topicTriggers {
  		# Check every inherited topic.
  		foreach my $inherits (sort { $a cmp $b } keys %{$self->{lineage}->{$topic}}) {
  			$self->debug ("\t\tTopic $topic inherits $inherits");
@@ -124,7 +132,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  		}
  	}
  
-@@ -1525,8 +1525,8 @@
+@@ -1525,8 +1525,8 @@ sub _topicTriggers {
  	if (exists $self->{lineage}->{$topic} || $inherited) {
  		my @inThisTopic = keys %{$triglvl->{$topic}};
  		foreach my $trigger (@inThisTopic) {
@@ -135,7 +143,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  		}
  	}
  	else {
-@@ -1590,7 +1590,7 @@
+@@ -1590,7 +1590,7 @@ The data structure returned from this wi
      "include" => { # topic inclusion
        "alpha" => [ "beta", "gamma" ], # > topic alpha includes beta gamma
      },
@@ -144,7 +152,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
        "alpha" => [ "delta" ], # > topic alpha inherits delta
      }
    }
-@@ -2645,7 +2645,7 @@
+@@ -2645,7 +2645,7 @@ sub _getreply {
  					$matched = $self->{topics}->{$topic}->{$trig};
  				}
  				else {
@@ -153,7 +161,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  					$matched = $self->_findTriggerByInheritence ($topic,$trig,0);
  				}
  
-@@ -2801,11 +2801,11 @@
+@@ -2801,11 +2801,11 @@ sub _findTriggerByInheritence {
  	# sorted array, but the trigger doesn't exist under the topic of
  	# which the user currently belongs. It probably was a trigger
  	# inherited/included from another topic. This subroutine finds that out,
@@ -167,9 +175,11 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  		return undef;
  	}
  
---- a/lib/RiveScript/WD.pm
-+++ b/lib/RiveScript/WD.pm
-@@ -364,7 +364,7 @@
+Index: librivescript-perl/lib/RiveScript/WD.pm
+===================================================================
+--- librivescript-perl.orig/lib/RiveScript/WD.pm
++++ librivescript-perl/lib/RiveScript/WD.pm
+@@ -364,7 +364,7 @@ of triggers of the source topic I<and> a
  higher matching priority than the inherited topics.
  
  See L<"Sorting +Triggers"> to see how triggers are sorted internally. The
@@ -178,7 +188,7 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  
    // This is in the default "random" topic and catches all non-matching
    // triggers.
-@@ -402,7 +402,7 @@
+@@ -402,7 +402,7 @@ C<*> trigger at the top, because that tr
  topic, and they're not in that topic.
  
  Now let's see how we can pair these topics up with includes and
@@ -187,8 +197,10 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  
    > topic ab includes alpha
      + hello bot
---- a/lib/RiveScript/demo/rpg.rive
-+++ b/lib/RiveScript/demo/rpg.rive
+Index: librivescript-perl/lib/RiveScript/demo/rpg.rive
+===================================================================
+--- librivescript-perl.orig/lib/RiveScript/demo/rpg.rive
++++ librivescript-perl/lib/RiveScript/demo/rpg.rive
 @@ -1,6 +1,6 @@
  ! version = 2.00
  
@@ -197,9 +209,11 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
  //
  // includes: this means that the topic "includes" the triggers present
  //           in another topic. Matching triggers in the source and included
---- a/t/RiveScript.t
-+++ b/t/RiveScript.t
-@@ -568,7 +568,7 @@
+Index: librivescript-perl/t/RiveScript.t
+===================================================================
+--- librivescript-perl.orig/t/RiveScript.t
++++ librivescript-perl/t/RiveScript.t
+@@ -568,7 +568,7 @@ push @tests, sub {
  };
  
  push @tests, sub {
@@ -208,8 +222,10 @@ Bug: https://rt.cpan.org/Ticket/Display.html?id=118572
      my $rs = bot('
          > topic colors
              + what color is the sky
---- a/testsuite.rive
-+++ b/testsuite.rive
+Index: librivescript-perl/testsuite.rive
+===================================================================
+--- librivescript-perl.orig/testsuite.rive
++++ librivescript-perl/testsuite.rive
 @@ -600,7 +600,7 @@
  
  	+ about this game
diff --git a/lib/RiveScript.pm b/lib/RiveScript.pm
index 7a9cf7b..1c8f899 100644
--- a/lib/RiveScript.pm
+++ b/lib/RiveScript.pm
@@ -2867,7 +2867,7 @@ sub _reply_regexp {
 	$regexp =~ s/\*/(.+?)/ig;        # Convert * into (.+?)
 	$regexp =~ s/\#/(\\d+)/ig;    # Convert # into ([0-9]+?)
 	$regexp =~ s/\_/(\\w+)/ig; # Convert _ into ([A-Za-z]+?)
-	$regexp =~ s/\{weight=\d+\}//ig; # Remove {weight} tags.
+	$regexp =~ s/\s*\{weight=\d+\}\s*//ig; # Remove {weight} tags.
 	$regexp =~ s/<zerowidthstar>/(.*?)/i;
 	while ($regexp =~ /\[(.+?)\]/i) { # Optionals
 		my @parts = split(/\|/, $1);
@@ -3146,7 +3146,7 @@ sub processTags {
 				$insert = "\x00$match\x01";
 			}
 
-			$reply =~ s/<$match>/$insert/i;
+			$reply =~ s/<\Q$match\E>/$insert/i;
 		}
 		else {
 			last; # No more tags remaining.