diff --git a/assembler/README b/assembler/README
index b2f22965..bfc95865 100644
--- a/assembler/README
+++ b/assembler/README
@@ -1,5 +1,9 @@
-gen4asm is a program to compile an assembly language for the Intel 965 Express
-Chipset.  It has been used to construct programs for textured video in the 2d
-driver.
+intel-gen4asm is a program to compile an assembly language for the Intel 965
+Express Chipset.  It has been used to construct programs for textured video in
+the 2d driver.
 
 Some examples of gen4 assembly programs are in the doc/examples directory.
+
+Note that the language parsed by this assembler is not exactly what the final
+language is going to look like.  In particular, the send instructions need to
+be cleaned up and made more reasonable to program with.
diff --git a/assembler/src/Makefile.am b/assembler/src/Makefile.am
index b70f3959..baedab62 100644
--- a/assembler/src/Makefile.am
+++ b/assembler/src/Makefile.am
@@ -15,4 +15,4 @@ gram.h: gram.c
 BUILT_SOURCES = gram.h gram.c lex.c
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 
-# man_MANS = gen4asm.1
+# man_MANS = intel-gen4asm.1
diff --git a/assembler/src/main.c b/assembler/src/main.c
index 0f1a50a9..e2235340 100644
--- a/assembler/src/main.c
+++ b/assembler/src/main.c
@@ -43,7 +43,7 @@ static const struct option longopts[] = {
 
 void usage(void)
 {
-	fprintf(stderr, "usage: gen4asm [-o outputfile] inputfile\n");
+	fprintf(stderr, "usage: intel-gen4asm [-o outputfile] inputfile\n");
 }
 
 int main(int argc, char **argv)