diff --git a/src/passwd.cr b/src/passwd.cr
index 03215ea..40ef618 100644
--- a/src/passwd.cr
+++ b/src/passwd.cr
@@ -201,6 +201,7 @@ class AuthD::User
 			@office_phone_number = gecos[2]?
 			@home_phone_number = gecos[3]?
 			@other_contact = gecos[4]?
+			@avatar = gecos[5]? # CAUTION: NON-STANDARD EXTENSION
 		end
 
 		# FIXME: What about those two fields? Keep them, remove them?
diff --git a/src/user.cr b/src/user.cr
index 62e0c66..a112322 100644
--- a/src/user.cr
+++ b/src/user.cr
@@ -12,6 +12,7 @@ class AuthD::User
 	getter office_phone_number : String? = nil
 	getter home_phone_number   : String? = nil
 	getter other_contact   : String? = nil
+	getter avatar          : String? = nil
 
 	JSON.mapping({
 		login: String,
@@ -42,7 +43,8 @@ class AuthD::User
 			:full_name => @full_name,
 			:office_phone_number => @office_phone_number,
 			:home_phone_number => @home_phone_number,
-			:other_contact => @other_contact
+			:other_contact => @other_contact,
+			:avatar => @avatar
 		}
 	end
 end