doc/news.texi                 |  7 +++++++
 main.go                       |  1 -
 t/goredo-whichdo-regression.t | 21 +++++++++++++++++++++
 usage.go                      |  2 +-
 whichdo.go                    |  4 ++--

diff --git a/doc/news.texi b/doc/news.texi
index 2ee69d3874e49df4d7ca26ec8711bc45cf82b590115ddd9880de3662f2d4b406..e70123a7c33664912b25eb38c6b27850c06a3d8ca0a98257c3931ccf304bf6a6 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -2,6 +2,13 @@ @node News
 @cindex news
 @unnumbered News
 
+@anchor{Release 2_3_0}
+@section Release 2.3.0
+@itemize
+@item
+    Fix regressions in @command{redo-whichdo} happened after huge refactoring.
+@end itemize
+
 @anchor{Release 2_2_0}
 @section Release 2.2.0
 @itemize
diff --git a/main.go b/main.go
index 78f3d2fb527075ed960b7d58e5af897bb69b4e057cf07a50c66603d7e7474455..1b6963e047bfa61121826146779b9d9122141295ecc878caf7af33a1720d930c 100644
--- a/main.go
+++ b/main.go
@@ -394,7 +394,6 @@ 		dos, err = whichdo(tgts[0])
 		if err != nil {
 			break
 		}
-		sort.Strings(dos)
 		for _, do := range dos {
 			fmt.Println(do)
 		}
diff --git a/t/goredo-whichdo-regression.t b/t/goredo-whichdo-regression.t
new file mode 100755
index 0000000000000000000000000000000000000000..ea9ee9e52b10ee2b9b68d725c4be7adf0f09e6817eb0f85fe1e0021810e5d3ea
--- /dev/null
+++ b/t/goredo-whichdo-regression.t
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+testname=`basename "$0"`
+test_description="Check that dependencies have correct relative path after cd"
+. $SHARNESS_TEST_SRCDIR/sharness.sh
+export REDO_TOP_DIR="`pwd`" REDO_NO_PROGRESS=1
+
+cat > our <<EOF
+a/b/c.d.do
+a/b/default.d.do
+a/b/default.do
+a/default.d.do
+a/default.do
+default.d.do
+default.do
+EOF
+touch default.do
+redo-whichdo a/b/c.d > their
+test_expect_success expected "cmp --silent our their"
+
+test_done
diff --git a/usage.go b/usage.go
index 551106383819056f69ae62e8fab377770914174c47747f0762450b3af6b6e5af..446ac4153ceae9e298d0ef34b8ee7454a3e7ab5f1a64d40367c0e7cd10ce3b9c 100644
--- a/usage.go
+++ b/usage.go
@@ -24,7 +24,7 @@ 	"os"
 )
 
 const (
-	Version  = "2.2.0"
+	Version  = "2.3.0"
 	Warranty = `Copyright (C) 2020-2023 Sergey Matveev
 
 This program is free software: you can redistribute it and/or modify
diff --git a/whichdo.go b/whichdo.go
index 08e4fb9b4697291539d2b9c1e00928e3ce5350062376574ab04591d5dfb5b6e1..9770bc5f900063339669ce4390de3ea897cac44936a66b4fef1b8b225a3561c1 100644
--- a/whichdo.go
+++ b/whichdo.go
@@ -44,10 +44,10 @@ 		if err != nil {
 			return
 		}
 		for _, ifcreate := range dep.ifcreates {
-			dos = append(dos, ifcreate.RelTo(tgtH))
+			dos = append(dos, ifcreate.RelTo(Cwd))
 		}
 		for _, ifchange := range dep.ifchanges {
-			dos = append(dos, ifchange.tgt.RelTo(tgtH))
+			dos = append(dos, ifchange.tgt.RelTo(Cwd))
 		}
 	}
 	if doFile == "" {