diff --git a/config/buildroot_bbb.patch b/config/buildroot_bbb.patch
index b2b7c019119c9b70757674ef3dd644ae65e6a0f2..471b940959b001fed4cfa7c6812c94c36fb74fb9 100644
--- a/config/buildroot_bbb.patch
+++ b/config/buildroot_bbb.patch
@@ -4,8 +4,10 @@
  board/bbb-heiafr/linux_defconfig                   | 426 +++++++++++++++++++++
  .../patches/linux/0001_random_ssh_key_gen.patch    |  13 +
  .../patches/uboot/0001-board-seg7-gpio.patch       |  28 ++
- configs/bbb-heiafr_defconfig                       |  82 ++++
- 7 files changed, 710 insertions(+)
+ configs/bbb-heiafr_defconfig                       |  83 ++++
+ package/dropbear/S50dropbear                       |   2 +-
+ package/openssh/S50sshd                            |   3 +
+ 9 files changed, 715 insertions(+), 1 deletion(-)
 
 diff --git a/board/bbb-heiafr/bbb-heiafr.dts b/board/bbb-heiafr/bbb-heiafr.dts
 new file mode 100644
@@ -673,10 +675,10 @@ index 0000000000..d498df07e3
 + 	gpmc_init();
 diff --git a/configs/bbb-heiafr_defconfig b/configs/bbb-heiafr_defconfig
 new file mode 100644
-index 0000000000..08a403e543
+index 0000000000..a436f53777
 --- /dev/null
 +++ b/configs/bbb-heiafr_defconfig
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,83 @@
 +BR2_arm=y
 +BR2_cortex_a8=y
 +BR2_GLOBAL_PATCH_DIR="board/bbb-heiafr/patches"
@@ -732,6 +734,7 @@ index 0000000000..08a403e543
 +BR2_PACKAGE_JSON_FOR_MODERN_CPP=y
 +BR2_PACKAGE_LIBYAML=y
 +BR2_PACKAGE_YAML_CPP=y
++BR2_PACKAGE_DROPBEAR=y
 +BR2_PACKAGE_IFUPDOWN=y
 +BR2_PACKAGE_IPUTILS=y
 +BR2_PACKAGE_RPCBIND=y
@@ -759,3 +762,30 @@ index 0000000000..08a403e543
 +BR2_PACKAGE_HOST_DOSFSTOOLS=y
 +BR2_PACKAGE_HOST_GENIMAGE=y
 +BR2_PACKAGE_HOST_MTOOLS=y
+diff --git a/package/dropbear/S50dropbear b/package/dropbear/S50dropbear
+index 9474eaafaa..bb8e75850e 100644
+--- a/package/dropbear/S50dropbear
++++ b/package/dropbear/S50dropbear
+@@ -7,7 +7,7 @@
+ test -r /etc/default/dropbear && . /etc/default/dropbear
+ 
+ start() {
+-	DROPBEAR_ARGS="$DROPBEAR_ARGS -R"
++	DROPBEAR_ARGS="$DROPBEAR_ARGS -R -B"
+ 
+ 	# If /etc/dropbear is a symlink to /var/run/dropbear, and
+ 	#   - the filesystem is RO (i.e. we can not rm the symlink),
+diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd
+index 22da41d1ca..d4d2def008 100644
+--- a/package/openssh/S50sshd
++++ b/package/openssh/S50sshd
+@@ -3,6 +3,9 @@
+ # sshd        Starts sshd.
+ #
+ 
++# Exit if dropbear start script exists
++[ -f /etc/init.d/S50dropbear ] && exit 0
++
+ # Make sure the ssh-keygen progam exists
+ [ -f /usr/bin/ssh-keygen ] || exit 0
+ 
diff --git a/install-ubuntu-environment.sh b/install-ubuntu-environment.sh
index 0db482e86e946fef1daa540f6c33c0f08884f417..20163a2c0d1ae4a837eec7bb373d3ca8541d8ca7 100755
--- a/install-ubuntu-environment.sh
+++ b/install-ubuntu-environment.sh
@@ -21,7 +21,7 @@ sudo chmod +s /usr/bin/minicom
 
 #install some ubuntu tools
 sudo apt install -y g++ autoconf libtool device-tree-compiler make patch libglib2.0-dev u-boot-tools 
-sudo apt install -y libncurses5-dev mercurial flex bison swig python-dev python3-dev libyaml-dev
+sudo apt install -y libncurses5-dev mercurial flex bison swig python-dev python3-dev libyaml-dev libssl-dev
 
 #install git tools and configure keyring
 sudo apt install -y git git-gui meld