diff --git a/AUTHORS b/AUTHORS
index a34b1f7f..9c65c99c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Kent R. Spillner
   Ben Boeckel
   Michael Meier
+  Martin Boeker
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index 83d856fa..fe7a409c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@
 - Fixed problem where a specific start time closed the previous open interval
   at the current time.
           (thanks to Michael Meier).
+- Fixed utf8 encoding in Taskwarrior integration hook
+          (thanks to Martin Boeker).
 
 ------ current release ---------------------------
 
diff --git a/ext/on-modify.timewarrior b/ext/on-modify.timewarrior
index c01acd59..f4898efd 100755
--- a/ext/on-modify.timewarrior
+++ b/ext/on-modify.timewarrior
@@ -50,7 +50,7 @@ if 'project' in new:
 if 'tags' in new:
   tags.extend(new['tags'])
 
-combined = ' '.join(['"%s"' % tag for tag in tags])
+combined = ' '.join(['"%s"' % tag for tag in tags]).encode('utf-8').strip()
 
 # Started task.
 if 'start' in new and not 'start' in old: