diff --git a/src/os_amiga.c b/src/os_amiga.c
index dfc8053..aff24c5 100644
--- a/src/os_amiga.c
+++ b/src/os_amiga.c
@@ -664,7 +664,15 @@
     int
 mch_get_user_name(char_u *s, int len)
 {
-    /* TODO: Implement this. */
+#if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__)
+    struct passwd   *pwd = getpwuid(getuid());
+
+    if (pwd != NULL && pwd->pw_name && len > 0)
+    {
+        vim_strncpy(s, (char_u *)pwd->pw_name, len - 1);
+        return OK;
+    }
+#endif
     *s = NUL;
     return FAIL;
 }
diff --git a/src/os_amiga.h b/src/os_amiga.h
index 6f951fb..71841ac 100644
--- a/src/os_amiga.h
+++ b/src/os_amiga.h
@@ -90,6 +90,7 @@
 # include <unistd.h>
 # include <limits.h>
 # include <errno.h>
+# include <pwd.h>
 # include <dirent.h>
 #endif
 
diff --git a/src/version.c b/src/version.c
index 98ddcca..6c17851 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2084,
+/**/
     2083,
 /**/
     2082,