diff --git a/nexgb/bigreq/bigreq.go b/nexgb/bigreq/bigreq.go
index 2ff767a..d2adcc7 100644
--- a/nexgb/bigreq/bigreq.go
+++ b/nexgb/bigreq/bigreq.go
@@ -1,10 +1,7 @@
 // Package bigreq is the X client API for the BIG-REQUESTS extension.
 package bigreq
 
-/*
-	This file was generated by bigreq.xml on Aug 11 2013 8:39:42pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from bigreq.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/composite/composite.go b/nexgb/composite/composite.go
index de1b773..c951a69 100644
--- a/nexgb/composite/composite.go
+++ b/nexgb/composite/composite.go
@@ -1,10 +1,7 @@
 // Package composite is the X client API for the Composite extension.
 package composite
 
-/*
-	This file was generated by composite.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from composite.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/damage/damage.go b/nexgb/damage/damage.go
index 72e0f3d..0ab7668 100644
--- a/nexgb/damage/damage.go
+++ b/nexgb/damage/damage.go
@@ -1,10 +1,7 @@
 // Package damage is the X client API for the DAMAGE extension.
 package damage
 
-/*
-	This file was generated by damage.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from damage.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/dpms/dpms.go b/nexgb/dpms/dpms.go
index 96d82f0..75ec85d 100644
--- a/nexgb/dpms/dpms.go
+++ b/nexgb/dpms/dpms.go
@@ -1,10 +1,7 @@
 // Package dpms is the X client API for the DPMS extension.
 package dpms
 
-/*
-	This file was generated by dpms.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from dpms.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/dri2/dri2.go b/nexgb/dri2/dri2.go
index 3c63af5..1561832 100644
--- a/nexgb/dri2/dri2.go
+++ b/nexgb/dri2/dri2.go
@@ -1,10 +1,7 @@
 // Package dri2 is the X client API for the DRI2 extension.
 package dri2
 
-/*
-	This file was generated by dri2.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from dri2.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/ge/ge.go b/nexgb/ge/ge.go
index 5e01d1e..1cfd918 100644
--- a/nexgb/ge/ge.go
+++ b/nexgb/ge/ge.go
@@ -1,10 +1,7 @@
 // Package ge is the X client API for the Generic Event Extension extension.
 package ge
 
-/*
-	This file was generated by ge.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from ge.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/glx/glx.go b/nexgb/glx/glx.go
index facf12e..84d37b5 100644
--- a/nexgb/glx/glx.go
+++ b/nexgb/glx/glx.go
@@ -1,10 +1,7 @@
 // Package glx is the X client API for the GLX extension.
 package glx
 
-/*
-	This file was generated by glx.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from glx.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/randr/randr.go b/nexgb/randr/randr.go
index 81104eb..8891f98 100644
--- a/nexgb/randr/randr.go
+++ b/nexgb/randr/randr.go
@@ -1,10 +1,7 @@
 // Package randr is the X client API for the RANDR extension.
 package randr
 
-/*
-	This file was generated by randr.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from randr.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/record/record.go b/nexgb/record/record.go
index 2bbfe1c..8cb495e 100644
--- a/nexgb/record/record.go
+++ b/nexgb/record/record.go
@@ -1,10 +1,7 @@
 // Package record is the X client API for the RECORD extension.
 package record
 
-/*
-	This file was generated by record.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from record.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/render/render.go b/nexgb/render/render.go
index c6f5095..7851e02 100644
--- a/nexgb/render/render.go
+++ b/nexgb/render/render.go
@@ -1,10 +1,7 @@
 // Package render is the X client API for the RENDER extension.
 package render
 
-/*
-	This file was generated by render.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from render.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/res/res.go b/nexgb/res/res.go
index 671f691..be0d6ce 100644
--- a/nexgb/res/res.go
+++ b/nexgb/res/res.go
@@ -1,10 +1,7 @@
 // Package res is the X client API for the X-Resource extension.
 package res
 
-/*
-	This file was generated by res.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from res.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/screensaver/screensaver.go b/nexgb/screensaver/screensaver.go
index f693b52..e552c6d 100644
--- a/nexgb/screensaver/screensaver.go
+++ b/nexgb/screensaver/screensaver.go
@@ -1,10 +1,7 @@
 // Package screensaver is the X client API for the MIT-SCREEN-SAVER extension.
 package screensaver
 
-/*
-	This file was generated by screensaver.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from screensaver.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index d0d5b8c..93ff9d0 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -1,10 +1,7 @@
 // Package shape is the X client API for the SHAPE extension.
 package shape
 
-/*
-	This file was generated by shape.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from shape.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/shm/shm.go b/nexgb/shm/shm.go
index bd5d638..3e086c4 100644
--- a/nexgb/shm/shm.go
+++ b/nexgb/shm/shm.go
@@ -1,10 +1,7 @@
 // Package shm is the X client API for the MIT-SHM extension.
 package shm
 
-/*
-	This file was generated by shm.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from shm.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/sync/sync.go b/nexgb/sync/sync.go
index ff83384..93fb2b7 100644
--- a/nexgb/sync/sync.go
+++ b/nexgb/sync/sync.go
@@ -1,10 +1,7 @@
 // Package sync is the X client API for the SYNC extension.
 package sync
 
-/*
-	This file was generated by sync.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from sync.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xcmisc/xcmisc.go b/nexgb/xcmisc/xcmisc.go
index e32ae42..5cff5f1 100644
--- a/nexgb/xcmisc/xcmisc.go
+++ b/nexgb/xcmisc/xcmisc.go
@@ -1,10 +1,7 @@
 // Package xcmisc is the X client API for the XC-MISC extension.
 package xcmisc
 
-/*
-	This file was generated by xc_misc.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xc_misc.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xevie/xevie.go b/nexgb/xevie/xevie.go
index 0dd5aca..a8303a2 100644
--- a/nexgb/xevie/xevie.go
+++ b/nexgb/xevie/xevie.go
@@ -1,10 +1,7 @@
 // Package xevie is the X client API for the XEVIE extension.
 package xevie
 
-/*
-	This file was generated by xevie.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xevie.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xf86dri/xf86dri.go b/nexgb/xf86dri/xf86dri.go
index 1a6fddf..5180b76 100644
--- a/nexgb/xf86dri/xf86dri.go
+++ b/nexgb/xf86dri/xf86dri.go
@@ -1,10 +1,7 @@
 // Package xf86dri is the X client API for the XFree86-DRI extension.
 package xf86dri
 
-/*
-	This file was generated by xf86dri.xml on Aug 11 2013 8:39:43pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xf86dri.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xf86vidmode/xf86vidmode.go b/nexgb/xf86vidmode/xf86vidmode.go
index 17c3f3c..55ca67b 100644
--- a/nexgb/xf86vidmode/xf86vidmode.go
+++ b/nexgb/xf86vidmode/xf86vidmode.go
@@ -1,10 +1,7 @@
 // Package xf86vidmode is the X client API for the XFree86-VidModeExtension extension.
 package xf86vidmode
 
-/*
-	This file was generated by xf86vidmode.xml on Aug 11 2013 8:39:44pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xf86vidmode.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xfixes/xfixes.go b/nexgb/xfixes/xfixes.go
index 76ffddf..94e96e1 100644
--- a/nexgb/xfixes/xfixes.go
+++ b/nexgb/xfixes/xfixes.go
@@ -1,10 +1,7 @@
 // Package xfixes is the X client API for the XFIXES extension.
 package xfixes
 
-/*
-	This file was generated by xfixes.xml on Aug 11 2013 8:39:44pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xfixes.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xgbgen/context.go b/nexgb/xgbgen/context.go
index 697413e..af0f598 100644
--- a/nexgb/xgbgen/context.go
+++ b/nexgb/xgbgen/context.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"log"
 	"sort"
-	"time"
 )
 
 // Context represents the protocol we're converting to Go, and a writer
@@ -56,11 +55,8 @@ func (c *Context) Morph(xmlBytes []byte) {
 		c.protocol.PkgName(), c.protocol.ExtXName)
 	c.Putln("package %s", c.protocol.PkgName())
 	c.Putln("")
-	c.Putln("/*")
-	c.Putln("\tThis file was generated by %s.xml on %s.",
-		c.protocol.Name, time.Now().Format("Jan 2 2006 3:04:05pm MST"))
-	c.Putln("\tThis file is automatically generated. Edit at your peril!")
-	c.Putln("*/")
+	c.Putln("// This file is automatically generated from %s.xml. "+
+		"Edit at your peril!", c.protocol.Name)
 	c.Putln("")
 
 	// Write imports. We always need to import at least xgb.
diff --git a/nexgb/xinerama/xinerama.go b/nexgb/xinerama/xinerama.go
index dd3732f..7426e8e 100644
--- a/nexgb/xinerama/xinerama.go
+++ b/nexgb/xinerama/xinerama.go
@@ -1,10 +1,7 @@
 // Package xinerama is the X client API for the XINERAMA extension.
 package xinerama
 
-/*
-	This file was generated by xinerama.xml on Aug 11 2013 8:39:44pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xinerama.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xinput/xinput.go b/nexgb/xinput/xinput.go
index c5a799d..931216e 100644
--- a/nexgb/xinput/xinput.go
+++ b/nexgb/xinput/xinput.go
@@ -1,10 +1,7 @@
 // Package xinput is the X client API for the XInputExtension extension.
 package xinput
 
-/*
-	This file was generated by xinput.xml on Aug 11 2013 8:39:44pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xinput.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xprint/xprint.go b/nexgb/xprint/xprint.go
index 8dfc660..48557fe 100644
--- a/nexgb/xprint/xprint.go
+++ b/nexgb/xprint/xprint.go
@@ -1,10 +1,7 @@
 // Package xprint is the X client API for the XpExtension extension.
 package xprint
 
-/*
-	This file was generated by xprint.xml on Aug 11 2013 8:39:44pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xprint.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xproto/xproto.go b/nexgb/xproto/xproto.go
index f162b19..f775a81 100644
--- a/nexgb/xproto/xproto.go
+++ b/nexgb/xproto/xproto.go
@@ -1,10 +1,7 @@
 // Package xproto is the X client API for the  extension.
 package xproto
 
-/*
-	This file was generated by xproto.xml on Aug 11 2013 8:39:44pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xproto.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xselinux/xselinux.go b/nexgb/xselinux/xselinux.go
index c7183bf..757a285 100644
--- a/nexgb/xselinux/xselinux.go
+++ b/nexgb/xselinux/xselinux.go
@@ -1,10 +1,7 @@
 // Package xselinux is the X client API for the SELinux extension.
 package xselinux
 
-/*
-	This file was generated by xselinux.xml on Aug 11 2013 8:39:44pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xselinux.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xtest/xtest.go b/nexgb/xtest/xtest.go
index 505622a..982e9f9 100644
--- a/nexgb/xtest/xtest.go
+++ b/nexgb/xtest/xtest.go
@@ -1,10 +1,7 @@
 // Package xtest is the X client API for the XTEST extension.
 package xtest
 
-/*
-	This file was generated by xtest.xml on Aug 11 2013 8:39:44pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xtest.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xv/xv.go b/nexgb/xv/xv.go
index f5539b3..0a88632 100644
--- a/nexgb/xv/xv.go
+++ b/nexgb/xv/xv.go
@@ -1,10 +1,7 @@
 // Package xv is the X client API for the XVideo extension.
 package xv
 
-/*
-	This file was generated by xv.xml on Aug 11 2013 8:39:44pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xv.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"
diff --git a/nexgb/xvmc/xvmc.go b/nexgb/xvmc/xvmc.go
index 9bcb60b..f0988eb 100644
--- a/nexgb/xvmc/xvmc.go
+++ b/nexgb/xvmc/xvmc.go
@@ -1,10 +1,7 @@
 // Package xvmc is the X client API for the XVideo-MotionCompensation extension.
 package xvmc
 
-/*
-	This file was generated by xvmc.xml on Aug 11 2013 8:39:44pm EDT.
-	This file is automatically generated. Edit at your peril!
-*/
+// This file is automatically generated from xvmc.xml. Edit at your peril!
 
 import (
 	"github.com/BurntSushi/xgb"