diff --git a/src/ChangeLog b/src/ChangeLog
index 023fec49..bc9df474 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-15  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* host.h (ip_address): Remove the trailing comma from the type
+	enum in the no-IPv6 case.
+
+	* main.c (struct cmdline_option): Remove the trailing comma from
+	the enum.
+
+	Reported by Jens Schleusener.
+
 2005-05-30  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* url.c (strpbrk_or_eos): Check for a recent GCC version before
diff --git a/src/host.h b/src/host.h
index 495f701d..b709c166 100644
--- a/src/host.h
+++ b/src/host.h
@@ -49,9 +49,9 @@ struct address_list;
 typedef struct {
   /* Address type. */
   enum { 
-    IPV4_ADDRESS, 
+    IPV4_ADDRESS
 #ifdef ENABLE_IPV6
-    IPV6_ADDRESS 
+    , IPV6_ADDRESS 
 #endif /* ENABLE_IPV6 */
   } type;
 
diff --git a/src/main.c b/src/main.c
index 4824c7b8..73aba87c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -144,7 +144,7 @@ struct cmdline_option {
     OPT__DONT_REMOVE_LISTING,
     OPT__EXECUTE,
     OPT__NO,
-    OPT__PARENT,
+    OPT__PARENT
   } type;
   const void *data;		/* for standard options */
   int argtype;			/* for non-standard options */