diff --git a/CHANGES b/CHANGES
index 85e5165..9e35e3e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 Change log for iftop
 $Id$
 
+0.3
+
+Fixed segfault bug.
+
 0.2 02/04/02
 
 Added -n option to analyse traffic flows across a network boundary.
diff --git a/Makefile b/Makefile
index bbebd8f..f9f6e65 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ MANDIR = man
 #MANDIR = share/man     # FHS-ish
 
 # You shouldn't need to change anything below this point.
-VERSION = 0.2
+VERSION = 0.3
 CFLAGS  += -g -Wall "-DIFTOP_VERSION=\"$(VERSION)\""
 LDFLAGS += -g 
 LDLIBS += -lpcap -lpthread -lcurses -lm
diff --git a/options.c b/options.c
index 8c07e6c..c877762 100644
--- a/options.c
+++ b/options.c
@@ -26,6 +26,7 @@ static void set_defaults() {
     options.dnsresolution = 1;
     options.promiscuous = 0;
     options.showbars = 1;
+    options.aggregate = OPTION_AGGREGATE_OFF;
 }
 
 static void die(char *msg) {
diff --git a/options.h b/options.h
index 372b07a..cd471b8 100644
--- a/options.h
+++ b/options.h
@@ -10,6 +10,12 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+enum {
+  OPTION_AGGREGATE_OFF,
+  OPTION_AGGREGATE_SOURCE,
+  OPTION_AGGREGATE_DEST
+} option_aggregate_t;
+
 typedef struct {
     /* interface to listen on */
     char *interface;
@@ -24,6 +30,7 @@ typedef struct {
     int dnsresolution;
     int promiscuous;
     int showbars;
+    option_aggregate_t aggregate;
 
 } options_t;