diff --git a/busybox.changes b/busybox.changes
index f7760bf..c6f9117 100644
--- a/busybox.changes
+++ b/busybox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 22 12:10:55 UTC 2021 - Lukas Lansky <lukas.lansky@suse.com>
+
+- Enable fdisk (jsc#CAR-16)
+- Add testsuite-gnu-echo.patch: testing.sh to use GNU echo 
+
 -------------------------------------------------------------------
 Thu Oct 21 17:43:22 UTC 2021 - Stephan Kulow <coolo@suse.com>
 
diff --git a/busybox.config b/busybox.config
index 4539dc8..fdabae3 100644
--- a/busybox.config
+++ b/busybox.config
@@ -608,9 +608,9 @@ CONFIG_FATATTR=y
 # CONFIG_FEATURE_FBSET_FANCY is not set
 # CONFIG_FEATURE_FBSET_READMODE is not set
 # CONFIG_FDFORMAT is not set
-# CONFIG_FDISK is not set
+CONFIG_FDISK=y
 # CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
+CONFIG_FEATURE_FDISK_WRITABLE=y
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
 # CONFIG_FEATURE_SUN_LABEL is not set
diff --git a/busybox.spec b/busybox.spec
index bbeede3..cc999e5 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -35,6 +35,7 @@ Source6:        https://busybox.net/~vda/vda_pubkey.gpg#/%{name}.keyring
 Source7:        busybox.config.static.warewulf3
 Patch0:         cpio-long-opt.patch
 Patch1:         sendmail-ignore-F-option.patch
+Patch2:         testsuite-gnu-echo.patch
 # other patches
 Patch100:       busybox.install.patch
 Provides:       useradd_or_adduser_dep
@@ -91,6 +92,7 @@ PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch100 -p0
 cp -a %{SOURCE1} docs/
 find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \
diff --git a/testsuite-gnu-echo.patch b/testsuite-gnu-echo.patch
new file mode 100644
index 0000000..5c10a9e
--- /dev/null
+++ b/testsuite-gnu-echo.patch
@@ -0,0 +1,26 @@
+From 0bc41194d1f934f94c84fd0a7b835cee6961d824 Mon Sep 17 00:00:00 2001
+From: Bogdan Lezhepekov <bogdan.lezhepekov@suse.com>
+Date: Thu, 4 Feb 2021 18:02:11 +0200
+Subject: [PATCH v1] testing.sh: Use GNU echo instead of builtin
+
+Signed-off-by: Bogdan Lezhepekov <bogdan.lezhepekov@suse.com>
+---
+ testsuite/testing.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testsuite/testing.sh b/testsuite/testing.sh
+index f5b756947..c853f3cfd 100644
+--- a/testsuite/testing.sh
++++ b/testsuite/testing.sh
+@@ -39,7 +39,7 @@ export SKIP=
+ # Helper for helpers. Oh my...
+ 
+ test x"$ECHO" != x"" || {
+-	ECHO="echo"
++	ECHO="/bin/echo"
+ 	test x"`echo -ne`" = x"" || {
+ 		# Compile and use a replacement 'echo' which understands -e -n
+ 		ECHO="$PWD/echo-ne"
+-- 
+2.26.2
+