diff --git a/ChangeLog b/ChangeLog
index 1d7be32ef..1506f6d1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gnulib/vasnprintf.c (vasnprintf): Make
+	long long printing work if snprintf is not 
+	available.  (#332841, Michael McDonald)
+
 2006-04-04  Pema Geyleg  <pema.geyleg@gmail.com>
 
 	* configure.in: Added dz (Dzongkha) to ALL_LINGUAS.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1d7be32ef..1506f6d1d 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2006-04-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gnulib/vasnprintf.c (vasnprintf): Make
+	long long printing work if snprintf is not 
+	available.  (#332841, Michael McDonald)
+
 2006-04-04  Pema Geyleg  <pema.geyleg@gmail.com>
 
 	* configure.in: Added dz (Dzongkha) to ALL_LINGUAS.
diff --git a/glib/gnulib/vasnprintf.c b/glib/gnulib/vasnprintf.c
index b95e119eb..1b468001d 100644
--- a/glib/gnulib/vasnprintf.c
+++ b/glib/gnulib/vasnprintf.c
@@ -853,11 +853,19 @@ vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
 				}
 			    }
 			  
-			  count = print_long_long (result + length, maxlen,
+#if HAVE_SNPRINTF
+ 			  count = print_long_long (result + length, maxlen,
+ 						   width, precision,
+ 						   dp->flags,
+ 						   dp->conversion,
+ 						   arg);
+#else
+			  count = print_long_long (tmp, tmp_length,
 						   width, precision,
 						   dp->flags,
 						   dp->conversion,
 						   arg);
+#endif
 			}
 			break;
 #else