diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000000000000000000000000000000000000..5d5760d30a44ee8f466ba5ba350e06435587a898
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,38 @@
+
+				  COPYRIGHT
+
+The following is a notice of limited availability of the code, and disclaimer
+which must be included in the prologue of the code and in all source listings
+of the code.
+
+Copyright Notice
+ + 2013 University of Chicago
+
+Permission is hereby granted to use, reproduce, prepare derivative works, and
+to redistribute to others.  This software was authored by:
+
+Mathematics and Computer Science Division
+Argonne National Laboratory, Argonne IL 60439
+
+(and)
+
+Computer Science Department
+Rensselaer Polytechnic Institute, Troy NY 12180
+
+			      GOVERNMENT LICENSE
+
+Portions of this material resulted from work developed under a U.S.
+Government Contract and are subject to the following license: the Government
+is granted for itself and others acting on its behalf a paid-up, nonexclusive,
+irrevocable worldwide license in this computer software to reproduce, prepare
+derivative works, and perform publicly and display publicly.
+
+				  DISCLAIMER
+
+This computer code material was prepared, in part, as an account of work
+sponsored by an agency of the United States Government.  Neither the United
+States, nor the University of Chicago, nor any of their employees, makes any
+warranty express or implied, or assumes any legal liability or responsibility
+for the accuracy, completeness, or usefulness of any information, apparatus,
+product, or process disclosed, or represents that its use would not infringe
+privately owned rights.
diff --git a/codes/dragonfly.h b/codes/dragonfly.h
index 314b9ff4f2e7ceb9f2a52dbc19340b47de320760..afb64ffd48fcb3ca9717e54fff93229c06ec34bf 100755
--- a/codes/dragonfly.h
+++ b/codes/dragonfly.h
@@ -1,8 +1,8 @@
 /*
- * * Copyright (C) 2011, University of Chicago
- * *
- * * See COPYRIGHT notice in top-level directory.
- * */
+ * Copyright (C) 2013 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
 
 #ifndef INC_dragonfly_h
 #define INC_dragonfly_h
@@ -221,3 +221,12 @@ static long long       total_hops = 0;
 static long long       N_finished_packets = 0;
 
 #endif
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ts=8 sts=4 sw=4 expandtab
+ */
diff --git a/codes/model-net-method.h b/codes/model-net-method.h
index 901b7dbbe00ade4e7c8b8b86cc89c4c2c2fee507..60c1bd9e6fda4a8c2322bc1a8c098c9492bdce68 100644
--- a/codes/model-net-method.h
+++ b/codes/model-net-method.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2013, University of Chicago
- *
+ * Copyright (C) 2013 University of Chicago.
  * See COPYRIGHT notice in top-level directory.
+ *
  */
 
 #ifndef MODELNET_METHOD_H
diff --git a/codes/model-net.h b/codes/model-net.h
index e9d682f09922cc6d36c01e7ea46baaf59f40608d..c594452027d3d986adb453fb9ee884e344c0bfd9 100644
--- a/codes/model-net.h
+++ b/codes/model-net.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2013, University of Chicago
- *
+ * Copyright (C) 2013 University of Chicago.
  * See COPYRIGHT notice in top-level directory.
+ *
  */
 
 #ifndef MODELNET_H
diff --git a/codes/torus.h b/codes/torus.h
index d87e40aade581dd54e5f6a3ec0850b3341883484..94c8d1e2b939ac52607c754ff7040ab0a80085d7 100644
--- a/codes/torus.h
+++ b/codes/torus.h
@@ -1,8 +1,8 @@
 /*
- * * Copyright (C) 2011, University of Chicago
- * *
- * * See COPYRIGHT notice in top-level directory.
- * */
+ * Copyright (C) 2013 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
 
 #ifndef INC_torus_h
 #define INC_torus_h
@@ -181,3 +181,12 @@ static long long       total_hops = 0;
 int num_chunks;
 
 #endif
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ts=8 sts=4 sw=4 expandtab
+ */
diff --git a/src/models/networks/model-net/dragonfly.c b/src/models/networks/model-net/dragonfly.c
index a9c0ce291ed08d4ee3072d61ed160d6ae3759df0..4e544c6da30b529cb6d50a6ed611132f05887c78 100644
--- a/src/models/networks/model-net/dragonfly.c
+++ b/src/models/networks/model-net/dragonfly.c
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) 2013 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+
 #include "codes/dragonfly.h"
 
 // Local router ID: 0 --- total_router-1
@@ -923,3 +929,12 @@ static const tw_lptype* dragonfly_get_router_lp_type(void)
 }          
 
 
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ts=8 sts=4 sw=4 expandtab
+ */
diff --git a/src/models/networks/model-net/model-net.c b/src/models/networks/model-net/model-net.c
index 03ebd6f8cbf41688d23f5bf58fc63a2d03d91b68..47d5c86e85542b88b43279048b37d066f3e0ee65 100644
--- a/src/models/networks/model-net/model-net.c
+++ b/src/models/networks/model-net/model-net.c
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2013, University of Chicago
- *
+ * Copyright (C) 2013 University of Chicago.
  * See COPYRIGHT notice in top-level directory.
+ *
  */
+
 #include <string.h>
 #include <assert.h>
 
diff --git a/src/models/networks/model-net/simplenet-upd.c b/src/models/networks/model-net/simplenet-upd.c
index 6435b0e4cbaf2bb5594f8c7be1167ce101f2de1b..7b6237bcc57f708060cf2386038588a59af88208 100644
--- a/src/models/networks/model-net/simplenet-upd.c
+++ b/src/models/networks/model-net/simplenet-upd.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2011, University of Chicago
- *
+ * Copyright (C) 2013 University of Chicago.
  * See COPYRIGHT notice in top-level directory.
+ *
  */
 
 #include <string.h>
diff --git a/src/models/networks/model-net/torus.c b/src/models/networks/model-net/torus.c
index 4c5490d2d5bc20564c5599cd4896d1bc06f56fa9..1422fbdad0a3d6ac6ca3f926ac3aa231eab45d1c 100644
--- a/src/models/networks/model-net/torus.c
+++ b/src/models/networks/model-net/torus.c
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) 2013 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+
 #include "codes/torus.h"
 
 /* setup the torus model, initialize global parameters */
@@ -591,3 +597,12 @@ static const tw_lptype* torus_get_lp_type(void)
    return(&torus_lp); 
 }
 
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ * End:
+ *
+ * vim: ts=8 sts=4 sw=4 expandtab
+ */
diff --git a/tests/modelnet-test.c b/tests/modelnet-test.c
index 5b544db7ac5cfedc6bde08858ab1f45fcd9f0d1c..fad0c0845aa159db56aea0e62e63582e9c02798e 100644
--- a/tests/modelnet-test.c
+++ b/tests/modelnet-test.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2011, University of Chicago
- *
+ * Copyright (C) 2013 University of Chicago.
  * See COPYRIGHT notice in top-level directory.
+ *
  */
 
 /* SUMMARY: