diff --git a/include/security/pam_constants.h b/include/security/pam_constants.h
index 85bfe57..941249f 100644
--- a/include/security/pam_constants.h
+++ b/include/security/pam_constants.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_constants.h#16 $
+ * $P4: //depot/projects/openpam/include/security/pam_constants.h#17 $
  */
 
 #ifndef _PAM_CONSTANTS_H_INCLUDED
@@ -122,6 +122,7 @@ enum {
 	PAM_USER_PROMPT			=   9,
 	PAM_AUTHTOK_PROMPT		=  10,		/* OpenPAM extension */
 	PAM_OLDAUTHTOK_PROMPT		=  11,		/* OpenPAM extension */
+	PAM_REPOSITORY			=  12,
 	PAM_NUM_ITEMS					/* OpenPAM extension */
 };
 
diff --git a/lib/pam_get_item.c b/lib/pam_get_item.c
index 0930d90..da2970e 100644
--- a/lib/pam_get_item.c
+++ b/lib/pam_get_item.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_item.c#12 $
+ * $P4: //depot/projects/openpam/lib/pam_get_item.c#13 $
  */
 
 #include <sys/param.h>
@@ -67,6 +67,7 @@ pam_get_item(pam_handle_t *pamh,
 	case PAM_USER_PROMPT:
 	case PAM_AUTHTOK_PROMPT:
 	case PAM_OLDAUTHTOK_PROMPT:
+	case PAM_REPOSITORY:
 		*item = pamh->item[item_type];
 		return (PAM_SUCCESS);
 	default:
diff --git a/lib/pam_set_item.c b/lib/pam_set_item.c
index 0fd7a97..b34bc78 100644
--- a/lib/pam_set_item.c
+++ b/lib/pam_set_item.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_set_item.c#14 $
+ * $P4: //depot/projects/openpam/lib/pam_set_item.c#15 $
  */
 
 #include <sys/param.h>
@@ -56,13 +56,12 @@ pam_set_item(pam_handle_t *pamh,
 	const void *item)
 {
 	void **slot, *tmp;
-	size_t size;
+	size_t nsize, osize;
 
 	if (pamh == NULL)
 		return (PAM_SYSTEM_ERR);
 
 	slot = &pamh->item[item_type];
-	tmp = NULL;
 	switch (item_type) {
 	case PAM_SERVICE:
 	case PAM_USER:
@@ -74,27 +73,31 @@ pam_set_item(pam_handle_t *pamh,
 	case PAM_USER_PROMPT:
 	case PAM_AUTHTOK_PROMPT:
 	case PAM_OLDAUTHTOK_PROMPT:
-		if (*slot != NULL)
-			size = strlen(*slot) + 1;
 		if (item != NULL)
-			if ((tmp = strdup(item)) == NULL)
-				return (PAM_BUF_ERR);
+			nsize = strlen(item) + 1;
+		if (*slot != NULL)
+			osize = strlen(*slot) + 1;
+		break;
+	case PAM_REPOSITORY:
+		osize = nsize = sizeof(struct pam_repository);
 		break;
 	case PAM_CONV:
-		size = sizeof(struct pam_conv);
-		if (item != NULL) {
-			if ((tmp = malloc(size)) == NULL)
-				return (PAM_BUF_ERR);
-			memcpy(tmp, item, sizeof(struct pam_conv));
-		}
+		osize = nsize = sizeof(struct pam_conv);
 		break;
 	default:
 		return (PAM_SYMBOL_ERR);
 	}
 	if (*slot != NULL) {
-		memset(*slot, 0xd0, size);
+		memset(*slot, 0xd0, osize);
 		free(*slot);
 	}
+	if (item != NULL) {
+		if ((tmp = malloc(nsize)) == NULL)
+			return (PAM_BUF_ERR);
+		memcpy(tmp, item, nsize);
+	} else {
+		tmp = NULL;
+	}
 	*slot = tmp;
 	return (PAM_SUCCESS);
 }