diff --git a/feeds/packages/net/openssh/patches/999-enable-root-and-pwd.patch b/feeds/packages/net/openssh/patches/999-enable-root-and-pwd.patch
new file mode 100644
index 0000000..0108bbd
--- /dev/null
+++ b/feeds/packages/net/openssh/patches/999-enable-root-and-pwd.patch
@@ -0,0 +1,12 @@
+--- openssh-8.2p1/sshd_config	2020-02-14 00:40:54.000000000 +0000
++++ openssh-8.2p1/sshd_config	2020-04-11 14:19:11.883636568 +0100
+@@ -29,7 +29,8 @@
+ # Authentication:
+ 
+ #LoginGraceTime 2m
+-#PermitRootLogin prohibit-password
++PermitRootLogin yes
++PermitEmptyPasswords yes
+ #StrictModes yes
+ #MaxAuthTries 6
+ #MaxSessions 10
diff --git a/package/network/config/firewall/files/firewall.config b/package/network/config/firewall/files/firewall.config
index 8874e98..d6752d3 100644
--- a/package/network/config/firewall/files/firewall.config
+++ b/package/network/config/firewall/files/firewall.config
@@ -27,6 +27,14 @@ config forwarding
 	option src		lan
 	option dest		wan
 
+config rule
+	option name		Allow-SSH
+	option src		wan
+	option proto		tcp
+	option dest_port	22
+	option target		ACCEPT
+	option family		ipv4
+
 # We need to accept udp packets on port 68,
 # see https://dev.openwrt.org/ticket/4108
 config rule