diff --git a/debian/changelog b/debian/changelog
index 55720caf..464d1e1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ shadow (1:4.1.2-1) experimental; urgency=low
       + debian/patches/579_chowntty_debug
       + debian/patches/200_Czech_binary_translation
       + debian/patches/494_passwd_lock-no_account_lock
+      + debian/patches/008_su_get_PAM_username
   * 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/008_su_get_PAM_username b/debian/patches/008_su_get_PAM_username
index 650a88eb..b88f72c4 100644
--- a/debian/patches/008_su_get_PAM_username
+++ b/debian/patches/008_su_get_PAM_username
@@ -23,9 +23,9 @@ Index: shadow-4.1.0/src/su.c
 --- shadow-4.1.0.orig/src/su.c
 +++ shadow-4.1.0/src/su.c
 @@ -309,6 +309,8 @@
- 	struct passwd *pw = 0;
  	char **envp = environ;
- 	char *shellstr = 0, *command = 0;
+ 	char *shellstr = NULL;
+ 	char *command = NULL;
 +	char *tmp_name;
 +	char **ptr_tmp_name = &tmp_name;
  
@@ -39,7 +39,7 @@ Index: shadow-4.1.0/src/su.c
 +	if (ret != PAM_SUCCESS) {
 +		SYSLOG((LOG_ERR, "pam_get_item: internal PAM error\n"));
 +		fprintf(stderr, "%s: Internal PAM error retrieving username\n", Prog);
-+		pam_end(pamh, ret);
++		(void) pam_end(pamh, ret);
 +		su_failure(tty);
 +	}
 +	strncpy(name, tmp_name, sizeof(name) - 1);