diff --git a/Changes b/Changes
index b4d3f3e..2e83009 100644
--- a/Changes
+++ b/Changes
@@ -35,6 +35,7 @@ Release ...
   following 'p' vi command pasted the text affected by the former vi command.
   It now pastes the text of the last yank or delete even if that was an ex
   command.
+* Some build fixes for diet libc have been made.
 
 Release 12/2/04
 * Support for multibyte character locales was added.
diff --git a/ex_put.c b/ex_put.c
index 1d4bec1..a014356 100644
--- a/ex_put.c
+++ b/ex_put.c
@@ -73,7 +73,7 @@
 
 #ifndef	lint
 #ifdef	DOSCCS
-static char sccsid[] = "@(#)ex_put.c	1.27 (gritter) 1/13/05";
+static char sccsid[] = "@(#)ex_put.c	1.28 (gritter) 1/16/05";
 #endif
 #endif
 
@@ -1120,12 +1120,14 @@ ttcharoff(void)
 	long vdis;
 
 	errno = 0;
+#ifndef	__dietlibc__
 	vdis = fpathconf(1, _PC_VDISABLE);
 	if (errno)
 		/*
 		 * Use the old value of 0377, hope it is not
 		 * the user's favourite character.
 		 */
+#endif	/* !__dietlibc__ */
 		vdis = '\377';
 #else	/* !_PC_VDISABLE */
 #define	vdis	'\377';
diff --git a/ex_version.c b/ex_version.c
index 00e29ae..9cd00a0 100644
--- a/ex_version.c
+++ b/ex_version.c
@@ -70,12 +70,12 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Sccsid @(#)ex_version.c	1.115 (gritter) 1/13/05
+ * Sccsid @(#)ex_version.c	1.116 (gritter) 1/16/05
  */
 
 #include "ex.h"
 
-static char *versionstring = "@(#)Version 4.0 (gritter) 1/13/05";
+static char *versionstring = "@(#)Version 4.0 (gritter) 1/16/05";
 
 void 
 printver(void)
diff --git a/ex_vget.c b/ex_vget.c
index 4ee8316..5c6535a 100644
--- a/ex_vget.c
+++ b/ex_vget.c
@@ -73,7 +73,7 @@
 
 #ifndef	lint
 #ifdef	DOSCCS
-static char sccsid[] = "@(#)ex_vget.c	1.26 (gritter) 11/27/04";
+static char sccsid[] = "@(#)ex_vget.c	1.27 (gritter) 1/16/05";
 #endif
 #endif
 
@@ -579,10 +579,14 @@ imacpush(int *ip, int canundo)
 	char	buf[BUFSIZ], *bp = buf;
 	int	n;
 
+#ifdef	MB
 	do {
 		n = wctomb(bp, *ip&TRIM);
 		bp += n;
 	} while (*ip++);
+#else	/* !MB */
+	while (*bp++ = *ip++);
+#endif	/* !MB */
 	macpush(buf, canundo);
 }
 
diff --git a/ex_vput.c b/ex_vput.c
index 1c260d5..589b3e8 100644
--- a/ex_vput.c
+++ b/ex_vput.c
@@ -73,7 +73,7 @@
 
 #ifndef	lint
 #ifdef	DOSCCS
-static char sccsid[] = "@(#)ex_vput.c	1.41 (gritter) 1/13/05";
+static char sccsid[] = "@(#)ex_vput.c	1.42 (gritter) 1/16/05";
 #endif
 #endif
 
@@ -600,8 +600,10 @@ vinschar(int c)
 			return c;
 		}
 		vputchar(c);
+#ifdef	MB
 		if (insmc1 == 0 && (vtube0[destcol]&(TRIM|MULTICOL))==MULTICOL)
 			vtube0[destcol] = INVBIT;
+#endif	/* MB */
 		if (DEPTH(vcline) * WCOLS + !value(REDRAW) >
 		    (destline - LINE(vcline)) * WCOLS + destcol)
 			return c;
@@ -686,9 +688,11 @@ vinschar(int c)
 		endim();
 		if (inscol + insmc0 != linend)
 			doomed -= inssiz + insmc1;
+#ifdef	MB
 		if (insmc1 == 0 && c != '\t' &&
 				vtube0[inscol+insmc0] & MULTICOL)
 			vtube0[inscol+insmc0] = INVBIT;
+#endif	/* MB */
 		do
 			vputchar(c);
 		while (--inssiz);