diff --git a/Makefile b/Makefile
index 9d28031..0a58fd6 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ HTML = index.html
 
 # Things to copy
 COPY += mdwntohtml template.xml
-COPY += face.png geneweb.cgi chumby-photo.cgi
+COPY += face.png chumby-photo.cgi
 COPY += format.css default.css print.css
 COPY += gitweb.cgi git-logo.png gitweb.css gitweb.conf
 
@@ -16,7 +16,9 @@ COPY += gitweb.cgi git-logo.png gitweb.css gitweb.conf
 PLAIN = . papers poems misc
 
 # Other targets for "make all"
-TARGETS = html copy $(DESTDIR)/tmp $(DESTDIR)/footer.xml $(DESTDIR)/projects
+TARGETS = html copy 
+TARGETS += $(DESTDIR)/tmp $(DESTDIR)/footer.xml $(DESTDIR)/projects
+TARGETS += $(DESTDIR)/geneweb.cgi
 
 all: default
 
@@ -39,6 +41,10 @@ $(DESTDIR)/footer.xml: $(TEMPLATE)
 $(DESTDIR)/projects:
 	ln -s $(HOME)/projects $@
 
+$(DESTDIR)/geneweb.cgi: geneweb.c
+	$(CC) -o $@ $<
+	chmod +s $@
+
 default: $(TARGETS)
 
 MDWN = $(wildcard $(addsuffix /*.mdwn, $(PLAIN)))
diff --git a/geneweb.c b/geneweb.c
new file mode 100644
index 0000000..8f4c9bf
--- /dev/null
+++ b/geneweb.c
@@ -0,0 +1,9 @@
+#include <unistd.h>
+
+int
+main(int argc, char *argv[])
+{
+  chdir("/home/neale/lib/geneweb");
+  execl("/usr/bin/gwd", "gwd", "-cgi", NULL);
+  return 0;
+}
\ No newline at end of file
diff --git a/geneweb.cgi b/geneweb.cgi
deleted file mode 100755
index fe9d521..0000000
Binary files a/geneweb.cgi and /dev/null differ