diff --git a/ChangeLog b/ChangeLog
index 7a47b45bf..2dfc1d555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,8 @@
 - TW-288 `task edit` mangles descriptions with embedded newlines (thanks to
          Kevin Ballard).
 - TW-294 Display UUID of task created by add (thanks to John West).
+- TW-295 Replacing annotations or descriptions which contain '/'s (thanks to
+         Johannes Schlatow).
 - TW-296 urgency of blocked task should affect urgency of blocking task (thanks
          to Sitaram Chamarty).
 - TW-306 Wrong date format in burndown view (thanks to Michele Santullo).
diff --git a/test/tw-295.t b/test/tw-295.t
new file mode 100755
index 000000000..1d93689d3
--- /dev/null
+++ b/test/tw-295.t
@@ -0,0 +1,29 @@
+#!/usr/bin/env python2.7
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import unittest
+from datetime import datetime
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+from basetest import Task, TestCase
+
+
+class TestBugNumber(TestCase):
+    @classmethod
+    def setUp(self):
+        self.t = Task()
+
+    def test_subst_with_slashes(self):
+        """Test substitution containing slashes"""
+        self.t(('add', '--', 'one/two/three'))
+        self.t(('1', 'modify', '/\\/two\\//TWO/'))
+        code, out, err = self.t(('list',))
+        self.assertIn('oneTWOthree', out)
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4