diff --git a/LICENSE b/LICENSE
index 4afb15965..fbdfc6945 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,4 @@
-Copyright (c) 2001-2003, Roger Dingledine, Matej Pfajfar, Naval
-Research Lab.
+Copyright (c) 2001-2003, Roger Dingledine
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/src/common/fakepoll.c b/src/common/fakepoll.c
index 4e512195a..dda122874 100644
--- a/src/common/fakepoll.c
+++ b/src/common/fakepoll.c
@@ -1,4 +1,4 @@
-/* Copyright 2002,2003 Nick Mathewson, Roger Dingledine, Naval Research Lab. */
+/* Copyright 2002,2003 Nick Mathewson, Roger Dingledine */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/fakepoll.h b/src/common/fakepoll.h
index b38e4ef05..61959d6c9 100644
--- a/src/common/fakepoll.h
+++ b/src/common/fakepoll.h
@@ -1,4 +1,4 @@
-/* Copyright 2002,2003 Nick Mathewson, Roger Dingledine, Naval Research Lab. */
+/* Copyright 2002,2003 Nick Mathewson, Roger Dingledine. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/log.h b/src/common/log.h
index d5b8e9b26..3927629c8 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -1,9 +1,6 @@
-/*
- * log.h
- * Logging facilities.
- * 
- * Matej Pfajfar <mp292@cam.ac.uk>
- */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* See LICENSE for licensing information */
+/* $Id$ */
 
 #ifndef __LOG_H
 
diff --git a/src/common/test.h b/src/common/test.h
index 7411d8f81..017ecf22d 100644
--- a/src/common/test.h
+++ b/src/common/test.h
@@ -1,4 +1,4 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/directory.c b/src/or/directory.c
index e4ab0ebe5..6771accce 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1,4 +1,4 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index f28f31b1d..362af6b64 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -127,7 +127,7 @@ dirserv_router_fingerprint_is_known(const routerinfo_t *router)
       break;
     }
   }
-  
+
   if (!ent) { /* No such server known */
     log_fn(LOG_INFO,"no fingerprint found for %s",router->nickname);
     return 0;
diff --git a/src/or/test.c b/src/or/test.c
index a4c03e2c4..5d395d0f4 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1,4 +1,4 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine. */
 /* See LICENSE for licensing information */
 /* $Id$ */