diff --git a/src/main-auth.c b/src/main-auth.c
index aaceb64e..9cfc95ad 100644
--- a/src/main-auth.c
+++ b/src/main-auth.c
@@ -205,12 +205,17 @@ int handle_auth_req(main_server_st *s, struct proc_st* proc,
 		   const struct cmd_auth_req_st * req)
 {
 int ret = -1;
+char ipbuf[128];
+const char* ip;
 unsigned username_set = 0;
 
+	ip = human_addr((void*)&proc->remote_addr, proc->remote_addr_len,
+			    ipbuf, sizeof(ipbuf));
+
 	if (req->user_pass_present != 0) {
 #ifdef HAVE_PAM
 		if ((s->config->auth_types & AUTH_TYPE_PAM) == AUTH_TYPE_PAM) {
-			ret = pam_auth_user(req->user, req->pass, proc->groupname, sizeof(proc->groupname));
+			ret = pam_auth_user(req->user, req->pass, proc->groupname, sizeof(proc->groupname), ip);
 			if (ret != 0)
 				ret = -1;
 
diff --git a/src/pam.c b/src/pam.c
index 105358ca..36a93dd6 100644
--- a/src/pam.c
+++ b/src/pam.c
@@ -64,7 +64,7 @@ struct pam_response *replies;
 
 /* Returns 0 if the user is successfully authenticated
  */
-int pam_auth_user(const char* user, const char* pass, char *groupname, int groupname_size)
+int pam_auth_user(const char* user, const char* pass, char *groupname, int groupname_size, const char* ip)
 {
 pam_handle_t * ph;
 int ret, pret;
@@ -81,6 +81,9 @@ struct passwd * pwd;
 		return -1;
 	}
 	
+	if (ip != NULL)
+		pam_set_item(ph, PAM_RHOST, ip);
+	
 	pret = pam_authenticate(ph, PAM_SILENT);
 	if (pret != PAM_SUCCESS) {
 		syslog(LOG_AUTH, "Error in PAM authentication: %s", pam_strerror(ph, pret));
diff --git a/src/pam.h b/src/pam.h
index 8e7d03c6..2867e634 100644
--- a/src/pam.h
+++ b/src/pam.h
@@ -1,6 +1,6 @@
 #ifndef PAM_H
 #define PAM_H
 
-int pam_auth_user(const char* user, const char* pass, char *groupname, int groupname_size);
+int pam_auth_user(const char* user, const char* pass, char *groupname, int groupname_size, const char* ip);
 
 #endif