diff --git a/configure.ac b/configure.ac
index 9b3c17bd..cd981c72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,17 +27,17 @@ AC_PROG_LIBTOOL
 
 # Checks for platform.
 # ----------------------------------------------------------------------
-case "$target" in
-*linux*)
+case "$target_os" in
+linux*|gnu*)
    my_htop_platform=linux
    ;;
-*freebsd*)
+freebsd*|kfreebsd*)
    my_htop_platform=freebsd
    ;;
-*openbsd*)
+openbsd*)
    my_htop_platform=openbsd
    ;;
-*darwin*)
+darwin*)
    my_htop_platform=darwin
    ;;
 *)
diff --git a/htop.1.in b/htop.1.in
index 1fa88ef9..93a5310f 100644
--- a/htop.1.in
+++ b/htop.1.in
@@ -10,7 +10,7 @@ Htop is a free (GPL) ncurses-based process viewer for Linux.
 .LP
 It is similar to top, but allows you to scroll vertically and horizontally,
 so you can see all the processes running on the system, along with their full
-command lines, as well as viewing them as a process tree, selecting mutiple
+command lines, as well as viewing them as a process tree, selecting multiple
 processes and acting on them all at once.
 .LP
 Tasks related to processes (killing, renicing) can be done without
diff --git a/htop.desktop b/htop.desktop
index 2f7a7ee6..b88d530a 100644
--- a/htop.desktop
+++ b/htop.desktop
@@ -60,3 +60,4 @@ GenericName[sv]=Processvisning
 GenericName[tr]=Süreç Görüntüleyici
 GenericName[uk]=Перегляд процесів
 GenericName[zh_TW]=行程檢視器
+Keywords=system;process;task