diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7bf7e8f..42bc8a5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,8 @@ For a list of breaking changes, check [here](#breaking-changes)
 
 ## Unreleased
 
-Thanks to [@cldwalker](https://github.com/cldwalker), [@dehli](https://github.com/dehli), [@djblue](https://github.com/djblue), [@GomoSDG](https://github.com/GomoSDG), [@grahamcarlyle](https://github.com/grahamcarlyle), @j-cr,
-[@jeroenvandijk](https://github.com/jeroenvandijk), [@justone](https://github.com/justone), [@kwrooijen](https://github.com/kwrooijen), [@lread](https://github.com/lread), @patrick-galvin and [@wodin](https://github.com/wodin) for
+Thanks to [@cldwalker](https://github.com/cldwalker), [@dehli](https://github.com/dehli), [@djblue](https://github.com/djblue), [@GomoSDG](https://github.com/GomoSDG), [@grahamcarlyle](https://github.com/grahamcarlyle), [@j-cr](https://github.com/j-cr),
+[@jeroenvandijk](https://github.com/jeroenvandijk), [@justone](https://github.com/justone), [@kwrooijen](https://github.com/kwrooijen), [@lread](https://github.com/lread), [@patrick-galvin](https://github.com/patrick-galvin) and [@wodin](https://github.com/wodin) for
 contributing to this release.
 
 ### New
@@ -17,7 +17,7 @@ contributing to this release.
 - Expose more transit vars [#525](https://github.com/borkdude/babashka/issues/525) ([@djblue](https://github.com/djblue))
 - Add support for `clojure.datafy`, `Datafiable` and `Navigable` [#468](https://github.com/borkdude/babashka/issues/468)
 - Add support for building and running uberjars [#536](https://github.com/borkdude/babashka/issues/536). See [docs](https://github.com/borkdude/babashka#uberjar).
-- Print context, locals and stack trace on exception [#543](https://github.com/borkdude/babashka/issues/543)
+- Print context, locals and stack trace on exception [#543](https://github.com/borkdude/babashka/issues/543).
 
 ### Fixed
 
@@ -31,7 +31,7 @@ contributing to this release.
 - Fix `false` dynamic binding value (which was read as `nil`) [borkdude/sci#379](https://github.com/borkdude/sci/issues/379)
 - Fix setting of `*warn-on-reflection*` in nREPL session [babashka/babashka.nrepl#25](https://github.com/babashka/babashka.nrepl/issues/25)
 - Fix order of namespaces in uberscript [#535](https://github.com/borkdude/babashka/issues/535)
-- Fix protocols with multiple methods on defrecords [borkdude/sci#367](https://github.com/borkdude/sci/issues/367) (@patrick-galvin)
+- Fix protocols with multiple methods on defrecords [borkdude/sci#367](https://github.com/borkdude/sci/issues/367) ([@patrick-galvin](https://github.com/patrick-galvin))
 
 ## v0.1.3 (2020-06-27)
 
diff --git a/script/changelog.clj b/script/changelog.clj
index b4644235..07d05728 100755
--- a/script/changelog.clj
+++ b/script/changelog.clj
@@ -20,7 +20,7 @@
                               (format " [babashka/babashka.nrepl#%s](https://github.com/babashka/babashka.nrepl/issues/%s)%s"
                                       issue issue (str after))))
       replaced (str/replace replaced
-                            #"@(\w+)([, .\)])"
+                            #"@([a-zA-Z0-9-_]+)([, \.)])"
                             (fn [[_ name after]]
                               (format "[@%s](https://github.com/%s)%s"
                                       name name after)))]