diff --git a/lib/configuration.sh b/lib/configuration.sh
index 35bec06d68..f8763df7e7 100644
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -134,7 +134,7 @@ case $RELEASE in
 	[[ $ARCH == armhf ]] && PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mate-utils ubuntu-mate-welcome mate-settings-daemon"
 	;;
 	stretch)
-	PACKAGE_LIST_RELEASE="man-db less kbd net-tools"
+	PACKAGE_LIST_RELEASE="man-db less kbd net-tools netcat-openbsd"
 	;;
 esac
 
diff --git a/lib/distributions.sh b/lib/distributions.sh
index 94481b7c0d..4fcee24dd6 100644
--- a/lib/distributions.sh
+++ b/lib/distributions.sh
@@ -191,6 +191,8 @@ install_distribution_specific()
 		;;
 
 	stretch)
+		# remove doubled uname from motd
+		[[ -f $SDCARD/etc/update-motd.d/10-uname ]] && rm $SDCARD/etc/update-motd.d/10-uname
 		;;
 	esac
 }