diff --git a/ChangeLog b/ChangeLog
index 4c02129437..8b28206a5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-14  Sven Neumann  <sven@gimp.org>
+
+	* libgimpwidgets/gimpmemsizeentry.[ch]: changed to use guint64
+	instead of gulong.
+
+	* app/core/gimptemplate.c (gimp_template_notify): removed unused
+	variable.
+
 2003-11-14  Sven Neumann  <sven@gimp.org>
 
 	* libgimpbase/gimputils.[ch] (gimp_memsize_to_string): take a
diff --git a/app/core/gimptemplate.c b/app/core/gimptemplate.c
index c85493d354..b67688a6a5 100644
--- a/app/core/gimptemplate.c
+++ b/app/core/gimptemplate.c
@@ -306,7 +306,6 @@ gimp_template_notify (GObject    *object,
                       GParamSpec *pspec)
 {
   GimpTemplate *template;
-  guint64       size;
   gint          channels;
 
   template = GIMP_TEMPLATE (object);
diff --git a/libgimpwidgets/gimpmemsizeentry.c b/libgimpwidgets/gimpmemsizeentry.c
index b9849a5e4b..995489a7c9 100644
--- a/libgimpwidgets/gimpmemsizeentry.c
+++ b/libgimpwidgets/gimpmemsizeentry.c
@@ -133,7 +133,7 @@ static void
 gimp_memsize_entry_adj_callback (GtkAdjustment    *adj,
 				 GimpMemsizeEntry *entry)
 {
-  gulong size = gtk_adjustment_get_value (adj);
+  guint64 size = gtk_adjustment_get_value (adj);
 
   entry->value = size << entry->shift;
 
@@ -173,9 +173,9 @@ gimp_memsize_entry_unit_callback (GtkWidget        *widget,
  * Returns: Pointer to the new #GimpMemsizeEntry.
  **/
 GtkWidget *
-gimp_memsize_entry_new (gulong  value,
-			gulong  lower,
-			gulong  upper)
+gimp_memsize_entry_new (guint64  value,
+			guint64  lower,
+			guint64  upper)
 {
   GimpMemsizeEntry *entry;
   guint             shift;
@@ -196,9 +196,9 @@ gimp_memsize_entry_new (gulong  value,
   entry->shift = shift;
 
   entry->spinbutton = gimp_spin_button_new ((GtkObject **) &entry->adjustment,
-                                            value >> shift,
-                                            lower >> shift,
-                                            upper >> shift, 1, 8, 0, 1, 0);
+                                            (value >> shift),
+                                            (lower >> shift),
+                                            (upper >> shift), 1, 8, 0, 1, 0);
 
   g_object_ref (entry->adjustment);
   gtk_object_sink (GTK_OBJECT (entry->adjustment));
@@ -237,7 +237,7 @@ gimp_memsize_entry_new (gulong  value,
  **/
 void
 gimp_memsize_entry_set_value (GimpMemsizeEntry *entry,
-			      gulong            value)
+			      guint64           value)
 {
   guint shift;
 
@@ -270,7 +270,7 @@ gimp_memsize_entry_set_value (GimpMemsizeEntry *entry,
  *
  * Returns: the current value of @entry (in Bytes).
  **/
-gulong
+guint64
 gimp_memsize_entry_get_value (GimpMemsizeEntry *entry)
 {
   g_return_val_if_fail (GIMP_IS_MEMSIZE_ENTRY (entry), 0);
diff --git a/libgimpwidgets/gimpmemsizeentry.h b/libgimpwidgets/gimpmemsizeentry.h
index 5a73190917..13fca38f14 100644
--- a/libgimpwidgets/gimpmemsizeentry.h
+++ b/libgimpwidgets/gimpmemsizeentry.h
@@ -1,17 +1,17 @@
-/* LIBGIMP - The GIMP Library 
- * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball                
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
  * gimpmemsizeentry.h
- * Copyright (C) 2000-2003  Sven Neumann <sven@gimp.org> 
+ * Copyright (C) 2000-2003  Sven Neumann <sven@gimp.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -42,9 +42,9 @@ struct _GimpMemsizeEntry
 {
   GtkHBox            parent_instance;
 
-  gulong             value;
-  gulong             lower;
-  gulong             upper;
+  guint64            value;
+  guint64            lower;
+  guint64            upper;
 
   guint              shift;
 
@@ -63,12 +63,12 @@ struct _GimpMemsizeEntryClass
 
 GType       gimp_memsize_entry_get_type  (void) G_GNUC_CONST;
 
-GtkWidget * gimp_memsize_entry_new       (gulong            value,
-					  gulong            lower,
-					  gulong            upper);
+GtkWidget * gimp_memsize_entry_new       (guint64           value,
+					  guint64           lower,
+					  guint64           upper);
 void        gimp_memsize_entry_set_value (GimpMemsizeEntry *entry,
-					  gulong            value);
-gulong      gimp_memsize_entry_get_value (GimpMemsizeEntry *entry);
+					  guint64           value);
+guint64     gimp_memsize_entry_get_value (GimpMemsizeEntry *entry);
 
 
 G_END_DECLS