diff --git a/src/osdef2.h.in b/src/osdef2.h.in
index 330a5a4f57..f29451ddfd 100644
--- a/src/osdef2.h.in
+++ b/src/osdef2.h.in
@@ -8,7 +8,11 @@ extern int	free(char *);
 extern char	*malloc(unsigned int);
 extern char	*realloc(char *, int);
 extern char	*getenv(char *);
+#ifndef __TANDEM
 extern int	setenv(char *, char *, int);
+#else
+extern int	setenv(const char *, const char *, int);
+#endif
 extern int	putenv(const char *);
 
 #ifndef __TANDEM
diff --git a/src/version.c b/src/version.c
index cb7ba1896c..afe8b24137 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1506,
 /**/
     1505,
 /**/