diff --git a/debian/changelog b/debian/changelog
index d6bbd9d3..690d4fc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ shadow (1:4.1.2-1) experimental; urgency=low
       + debian/patches/302_vim_selinux_support
       + debian/patches/008_login_log_failure_in_FTMP
       + debian/patches/429_login_FAILLOG_ENAB
+      + debian/patches/507_32char_grnames.dpatch
   * debian/patches/506_relaxed_usernames: Use an extra paragraph for the note
     on username with a '/'.
   * debian/patches/504_undef_USE_PAM.dpatch:
diff --git a/debian/patches/507_32char_grnames.dpatch b/debian/patches/507_32char_grnames.dpatch
index 4d7bb171..4a0dcfff 100755
--- a/debian/patches/507_32char_grnames.dpatch
+++ b/debian/patches/507_32char_grnames.dpatch
@@ -36,7 +36,7 @@ Index: shadow-4.1.0/libmisc/chkname.c
 --- shadow-4.1.0.orig/libmisc/chkname.c
 +++ shadow-4.1.0/libmisc/chkname.c
 @@ -70,10 +70,10 @@
- int check_group_name (const char *name)
+ bool is_valid_group_name (const char *name)
  {
  	/*
 -	 * Arbitrary limit for group names - max 16
@@ -44,9 +44,10 @@ Index: shadow-4.1.0/libmisc/chkname.c
 +	 * Arbitrary limit for group names - max 32
 +	 * same as linux UT_NAMESIZE
  	 */
--	if (strlen (name) > 16)
-+	if (strlen (name) > 32)
- 		return 0;
+-	if (strlen (name) > 16) {
++	if (strlen (name) > 32) {
+ 		return false;
+ 	}
  
  	return good_name (name);
 Index: shadow-4.1.1/man/groupadd.8.xml