diff --git a/acinclude.m4 b/acinclude.m4
index 602e934110..9b32096af8 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1411,7 +1411,6 @@ AC_CHECK_FUNCS([ \
 	geteuid \
 	getgid \
 	getuid \
-	getprogname \
 	getrlimit \
 	issetugid \
 	mkstemp \
@@ -1425,7 +1424,6 @@ AC_CHECK_FUNCS([ \
 	regerror \
 	regexec \
 	setitimer \
-	setprogname \
 	setvbuf \
 	sigaction \
 	strcasestr \
@@ -1485,6 +1483,7 @@ AC_REPLACE_FUNCS([ \
 	localtime_r \
 	mkstemp \
 	setenv \
+	setprogname \
 	strcasecmp \
 	strlcat \
 	strnlen \
diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in
index da0f10350c..ab2ec1bb0d 100644
--- a/src/roken/Makefile.in
+++ b/src/roken/Makefile.in
@@ -127,6 +127,9 @@ net_write.o: ${UPSTREAM}/net_write.c ${HEADERS}
 setenv.o: ${UPSTREAM}/setenv.c ${HEADERS}
 	$(AFS_CCRULE) $(UPSTREAM)/setenv.c
 
+setprogname.o: ${UPSTREAM}/setprogname.c ${HEADERS}
+	$(AFS_CCRULE) $(UPSTREAM)/setprogname.c
+
 socket.o: ${UPSTREAM}/socket.c ${HEADERS}
 	$(AFS_CCRULE) $(UPSTREAM)/socket.c
 
diff --git a/src/roken/NTMakefile b/src/roken/NTMakefile
index cc633363c8..591ad8987d 100644
--- a/src/roken/NTMakefile
+++ b/src/roken/NTMakefile
@@ -43,6 +43,7 @@ ROKEN_OBJS = \
 	$(OUT)\mkstemp.obj \
 	$(OUT)\net_read.obj \
 	$(OUT)\net_write.obj \
+	$(OUT)\setprogname.obj \
 	$(OUT)\snprintf.obj \
 	$(OUT)\socket.obj \
 	$(OUT)\strerror_r.obj \
diff --git a/src/roken/afsroken.def b/src/roken/afsroken.def
index 8c810e3c7b..6f717516ef 100644
--- a/src/roken/afsroken.def
+++ b/src/roken/afsroken.def
@@ -41,3 +41,4 @@ EXPORTS
         rk_tdelete              @45
         rk_tfind                @46
 	rk_getprogname		@47
+	rk_setprogname		@48