diff --git a/Makefile b/Makefile
index a3f7354..d5ddddf 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ dist:
 	$(RM) -r $(PACKAGE)-$(VERSION)
 	$(LN) . $(PACKAGE)-$(VERSION)
 	@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \
+		$(PACKAGE)-$(VERSION)/src/download.c \
 		$(PACKAGE)-$(VERSION)/src/surfer.c \
 		$(PACKAGE)-$(VERSION)/src/ghtml.c \
 		$(PACKAGE)-$(VERSION)/src/callbacks.c \
diff --git a/src/Makefile b/src/Makefile
index ee09435..06605c9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,13 +1,12 @@
-TARGETS	= surfer
+TARGETS	= download surfer
 PREFIX	= /usr/local
 DESTDIR	= 
 BINDIR	= $(PREFIX)/bin
 CC	= cc
 CPPFLAGSF=
 CPPFLAGS=
-CFLAGSF	= -W `pkg-config --cflags gtk+-2.0 firefox-gtkmozembed`
+CFLAGSF	= -W
 CFLAGS	= -Wall -g -O2 -ansi
-LDFLAGSF= `pkg-config --libs gtk+-2.0 firefox-gtkmozembed`
 LDFLAGS	= 
 RM	= rm -f
 MKDIR	= mkdir -p
@@ -16,11 +15,20 @@ INSTALL	= install
 
 all: $(TARGETS)
 
+download_OBJS = download.o
+download_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0 gnet-2.0`
+
+download: $(download_OBJS)
+	$(CC) -o download $(download_OBJS) $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-2.0 gnet-2.0`
+
 surfer_OBJS = surfer.o ghtml.o callbacks.o main.o
-surfer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+surfer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0 firefox-gtkmozembed`
 
 surfer: $(surfer_OBJS)
-	$(CC) -o surfer $(surfer_OBJS) $(LDFLAGSF) $(LDFLAGS)
+	$(CC) -o surfer $(surfer_OBJS) $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-2.0 firefox-gtkmozembed`
+
+download.o: download.c
+	$(CC) $(download_CFLAGS) -c download.c
 
 surfer.o: surfer.c callbacks.h surfer.h ../config.h
 	$(CC) $(surfer_CFLAGS) -c surfer.c
@@ -35,16 +43,19 @@ main.o: main.c surfer.h
 	$(CC) $(surfer_CFLAGS) -c main.c
 
 clean:
-	$(RM) $(surfer_OBJS)
+	$(RM) $(download_OBJS) $(surfer_OBJS)
 
 distclean: clean
 	$(RM) $(TARGETS)
 
 install: all
+	$(MKDIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 0755 download $(DESTDIR)$(BINDIR)/download
 	$(MKDIR) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -m 0755 surfer $(DESTDIR)$(BINDIR)/surfer
 
 uninstall:
+	$(RM) $(DESTDIR)$(BINDIR)/download
 	$(RM) $(DESTDIR)$(BINDIR)/surfer
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/project.conf b/src/project.conf
index d6f6767..e247bb6 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,12 +1,24 @@
-targets=surfer
-cflags_force=-W `pkg-config --cflags gtk+-2.0 firefox-gtkmozembed`
+targets=download,surfer
+cflags_force=-W
+#cppflags=-D WITH_GTKHTML
 cflags=-Wall -g -O2 -ansi
-ldflags_force=`pkg-config --libs gtk+-2.0 firefox-gtkmozembed`
 ldflags=
 dist=Makefile,callbacks.h,ghtml.h,surfer.h,ghtml-gtkhtml.c,ghtml-gtkmozembed.c,ghtml-gtktextview.c
 
+[download]
+type=binary
+cflags=`pkg-config --cflags gtk+-2.0 gnet-2.0`
+ldflags=`pkg-config --libs gtk+-2.0 gnet-2.0`
+sources=download.c
+install=$(BINDIR)
+
 [surfer]
 type=binary
+cflags=`pkg-config --cflags gtk+-2.0 firefox-gtkmozembed`
+ldflags=`pkg-config --libs gtk+-2.0 firefox-gtkmozembed`
+#cppflags=-D WITH_GTKHTML
+#cflags=`pkg-config --cflags gtk+-2.0 libgtkhtml-2.0 gnet-2.0`
+#ldflags=`pkg-config --cflags gtk+-2.0 libgtkhtml-2.0 gnet-2.0`
 sources=surfer.c,ghtml.c,callbacks.c,main.c
 install=$(BINDIR)
 
diff --git a/src/surfer.h b/src/surfer.h
index bf62e5e..500a141 100644
--- a/src/surfer.h
+++ b/src/surfer.h
@@ -19,7 +19,6 @@
 # define SURFER_SURFER_H
 
 # include <gtk/gtk.h>
-# include <gtkmozembed.h>
 
 
 /* Surfer */